From 49830864b3e8fc8b9fd30d366616f6256f4f1f4f Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Fri, 28 May 2021 09:03:29 +0200
Subject: [PATCH] Revert "Preemptive empty lines removal"

This reverts commit da38bf5df03a1f5e34608ae035ddeffa729d9a78.
---
 MQ/base/CbmMQChannels.cxx                                   | 4 +---
 MQ/base/CbmMQChannels.h                                     | 4 +---
 MQ/base/CbmMQDefs.h                                         | 3 ---
 MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx               | 3 ---
 MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h                 | 3 ---
 MQ/eTOF/runEventBuilderEtofStar2019.cxx                     | 4 +---
 MQ/eTOF/runTriggerHandlerEtof.cxx                           | 4 +---
 MQ/hitbuilder/runHitBuilderTof.cxx                          | 4 +---
 MQ/mcbm/runBuildRawEvents.cxx                               | 4 +---
 MQ/mcbm/runMcbmEventSink.cxx                                | 4 +---
 MQ/mcbm/runMcbmEvtBuilderWin.cxx                            | 4 +---
 MQ/mcbm/runMcbmMonitorPulser.cxx                            | 4 +---
 MQ/mcbm/runMcbmUnpack.cxx                                   | 4 +---
 MQ/monitor/runMonitorT0.cxx                                 | 4 +---
 MQ/monitor/runMonitorTof.cxx                                | 4 +---
 MQ/sink/runDevNullSink.cxx                                  | 4 +---
 MQ/sink/runTsaComponentSink.cxx                             | 4 +---
 MQ/source/runMCPointSource.cxx                              | 4 +---
 MQ/source/runStsDigiSource.cxx                              | 4 +---
 MQ/source/runTsaInfo.cxx                                    | 4 +---
 MQ/source/runTsaMultiSampler.cxx                            | 4 +---
 MQ/source/runTsaMultiSamplerTof.cxx                         | 4 +---
 MQ/source/runTsaSampler.cxx                                 | 4 +---
 MQ/source/runTsaSamplerTof.cxx                              | 4 +---
 MQ/sts/runStsLocalReco.cxx                                  | 4 +---
 MQ/unpacker/runUnpackTofMcbm2018.cxx                        | 4 +---
 MQ/unpacker/runUnpackTofStar2018.cxx                        | 4 +---
 .../PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h   | 3 ---
 analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h                  | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h                       | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx                     | 5 ++---
 analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h                       | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h            | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx                   | 5 ++---
 analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h                     | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx         | 5 ++---
 analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h           | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx                     | 5 ++---
 analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h                       | 4 +---
 analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h                      | 4 +---
 analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h               | 4 +---
 .../dielectron/conversion/CbmConversionAnalysisLinkDef.h    | 4 +---
 .../dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx      | 4 +---
 .../PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h | 4 +---
 .../PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h   | 4 +---
 analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx             | 5 ++---
 analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx             | 3 ---
 analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h               | 4 +---
 .../papaframework/AnalysisTaskMultiPairAnalysis.h           | 4 +---
 analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h   | 4 +---
 analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h     | 4 +---
 .../dielectron/papaframework/PairAnalysisFunction.cxx       | 3 ---
 .../PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h  | 3 ---
 .../dielectron/papaframework/PairAnalysisSignalExt.cxx      | 3 ---
 .../dielectron/papaframework/PairAnalysisSignalFit.cxx      | 3 ---
 .../dielectron/papaframework/PairAnalysisSignalFunc.cxx     | 3 ---
 .../dielectron/papaframework/PairAnalysisSpectrum.cxx       | 3 ---
 .../dielectron/papaframework/fastsim/CbmFastDecayer.cxx     | 4 +---
 .../dielectron/papaframework/fastsim/CbmFastDecayer.h       | 4 +---
 .../PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx  | 3 ---
 .../PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h    | 4 +---
 .../dielectron/papaframework/fastsim/CbmFastSimLinkDef.h    | 4 +---
 .../dielectron/papaframework/fastsim/scripts/SetCuts.C      | 4 +---
 .../dielectron/papaframework/fastsim/scripts/run_sim_fast.C | 3 ---
 analysis/PWGDIL/dielectron/papaframework/scripts/merge.C    | 4 +---
 .../dielectron/papaframework/scripts/run_common_analysis.C  | 4 +---
 .../PWGDIL/dielectron/papaframework/scripts/run_testing.C   | 4 +---
 .../dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h       | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h     | 4 +---
 .../dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h   | 4 +---
 .../PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h     | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h     | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h   | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h | 4 +---
 .../dielectron/pi0eta/CbmKresConversionManualmbias1.h       | 4 +---
 .../dielectron/pi0eta/CbmKresConversionManualmbias2.h       | 4 +---
 .../dielectron/pi0eta/CbmKresConversionManualmbias3.h       | 4 +---
 .../dielectron/pi0eta/CbmKresConversionManualmbias4.h       | 4 +---
 .../PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h     | 4 +---
 .../dielectron/pi0eta/CbmKresConversionReconstruction.h     | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h              | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h    | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h  | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h        | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h      | 4 +---
 analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h         | 4 +---
 .../PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h | 4 +---
 analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx             | 3 ---
 analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h               | 3 ---
 analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx              | 3 ---
 analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h                | 3 ---
 analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h             | 4 +---
 analysis/PWGHAD/hadron/CbmHadronLinkDef.h                   | 4 +---
 .../CbmAnalysisTreeInterfaceLinkDef.h                       | 4 +---
 .../common/analysis_tree_converter/CbmConverterManager.cxx  | 4 +---
 .../common/analysis_tree_converter/CbmConverterManager.h    | 4 +---
 .../common/analysis_tree_converter/CbmConverterTask.cxx     | 3 ---
 analysis/common/analysis_tree_converter/CbmConverterTask.h  | 4 +---
 .../analysis_tree_converter/CbmPsdModulesConverter.cxx      | 4 +---
 .../common/analysis_tree_converter/CbmPsdModulesConverter.h | 4 +---
 .../analysis_tree_converter/CbmRecEventHeaderConverter.cxx  | 4 +---
 .../analysis_tree_converter/CbmRecEventHeaderConverter.h    | 4 +---
 .../analysis_tree_converter/CbmRichRingsConverter.cxx       | 4 +---
 .../common/analysis_tree_converter/CbmRichRingsConverter.h  | 4 +---
 .../analysis_tree_converter/CbmSimEventHeaderConverter.cxx  | 4 +---
 .../analysis_tree_converter/CbmSimEventHeaderConverter.h    | 4 +---
 .../analysis_tree_converter/CbmSimTracksConverter.cxx       | 4 +---
 .../common/analysis_tree_converter/CbmSimTracksConverter.h  | 4 +---
 .../analysis_tree_converter/CbmStsTracksConverter.cxx       | 4 +---
 .../common/analysis_tree_converter/CbmStsTracksConverter.h  | 4 +---
 .../common/analysis_tree_converter/CbmTofHitsConverter.cxx  | 4 +---
 .../common/analysis_tree_converter/CbmTofHitsConverter.h    | 4 +---
 .../analysis_tree_converter/CbmTrdTracksConverter.cxx       | 4 +---
 .../common/analysis_tree_converter/CbmTrdTracksConverter.h  | 4 +---
 analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx    | 4 +---
 analysis/common/at_kfpf_interface/ATKFParticleFinder.h      | 4 +---
 .../at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h    | 4 +---
 analysis/common/at_kfpf_interface/CutsContainer.cxx         | 3 ---
 analysis/detectors/psd/CbmPsdAnaLinkDef.h                   | 4 +---
 analysis/detectors/psd/CbmPsdMCbmQaReal.cxx                 | 4 +---
 analysis/detectors/psd/CbmPsdMCbmQaReal.h                   | 4 +---
 analysis/detectors/sts/CbmStsAnaLinkDef.h                   | 4 +---
 analysis/detectors/tof/CbmTofAnaLinkDef.h                   | 4 +---
 analysis/detectors/tof/CbmTofHitFinderTBQA.cxx              | 3 ---
 core/base/CbmBaseLinkDef.h                                  | 4 +---
 core/base/CbmMCDataManager.cxx                              | 4 +---
 core/base/utils/CbmFileUtils.cxx                            | 4 +---
 core/base/utils/CbmFileUtils.h                              | 4 +---
 core/base/utils/CbmGeometryUtils.cxx                        | 4 +---
 core/base/utils/CbmGeometryUtils.h                          | 3 ---
 core/base/utils/CbmMediaList.cxx                            | 4 +---
 core/base/utils/CbmUtils.cxx                                | 4 +---
 core/base/utils/CbmUtils.h                                  | 4 +---
 core/config/CbmConfigBase.h                                 | 4 +---
 core/data/CbmDefs.cxx                                       | 4 +---
 core/data/DataLinkDef.h                                     | 4 +---
 core/data/much/CbmMuchAddress.cxx                           | 4 +---
 core/data/much/CbmMuchAddress.h                             | 4 +---
 core/data/much/CbmMuchCluster.cxx                           | 3 ---
 core/data/mvd/CbmMvdCluster.cxx                             | 4 +---
 core/data/mvd/CbmMvdCluster.h                               | 3 ---
 core/data/raw/StsXyterFinalHit.h                            | 3 ---
 core/data/raw/StsXyterMessage.cxx                           | 5 ++---
 core/data/raw/StsXyterMessage.h                             | 3 ---
 core/data/raw/TimesliceMetaData.cxx                         | 4 +---
 core/data/raw/TimesliceMetaData.h                           | 4 +---
 core/data/raw/gDpbMessv100.cxx                              | 4 +---
 core/data/raw/gDpbMessv100.h                                | 4 +---
 core/data/rich/CbmRichRing.cxx                              | 4 +---
 core/data/rich/CbmRichTrbDigi.cxx                           | 4 +---
 core/data/rich/CbmRichTrbDigi.h                             | 4 +---
 core/data/test/TestCbmHit.C                                 | 3 ---
 core/data/test/TestCbmPixelHit.C                            | 3 ---
 core/data/test/_GTestCbmAddress.cxx                         | 4 +---
 core/data/test/_GTestCbmCluster.cxx                         | 4 +---
 core/data/test/_GTestCbmConstants.cxx                       | 4 +---
 core/data/test/_GTestCbmDefs.cxx                            | 4 +---
 core/data/test/_GTestCbmDigi.cxx                            | 4 +---
 core/data/test/_GTestCbmErrorMessage.cxx                    | 4 +---
 core/data/test/_GTestCbmEvent.cxx                           | 3 ---
 core/data/test/_GTestCbmHit.cxx                             | 4 +---
 core/data/test/_GTestCbmLink.cxx                            | 4 +---
 core/data/test/_GTestCbmMatch.cxx                           | 4 +---
 core/data/test/_GTestCbmModuleList.cxx                      | 4 +---
 core/data/test/_GTestCbmPixelHit.cxx                        | 4 +---
 core/data/test/_GTestCbmStripHit.cxx                        | 4 +---
 core/data/test/compareCluster.h                             | 4 +---
 core/data/test/compareDigi.h                                | 4 +---
 core/data/test/compareErrorMessage.h                        | 4 +---
 core/data/test/compareFairMCPoint.h                         | 4 +---
 core/data/test/compareHit.h                                 | 4 +---
 core/data/test/compareLink.h                                | 4 +---
 core/data/test/compareMatch.h                               | 4 +---
 core/data/test/comparePixelHit.h                            | 4 +---
 core/data/test/compareStripHit.h                            | 4 +---
 core/data/test/compareVertex.h                              | 4 +---
 core/data/test/global/_GTestCbmVertex.cxx                   | 4 +---
 core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx           | 4 +---
 core/data/test/much/_GTestCbmMuchDigi.cxx                   | 4 +---
 core/data/test/much/compareMuchBeamTimeDigi.h               | 4 +---
 core/data/test/much/compareMuchDigi.h                       | 4 +---
 core/data/test/psd/_GTestCbmPsdAddress.cxx                  | 4 +---
 core/data/test/psd/_GTestCbmPsdDigi.cxx                     | 4 +---
 core/data/test/psd/_GTestCbmPsdHit.cxx                      | 4 +---
 core/data/test/psd/_GTestCbmPsdPoint.cxx                    | 4 +---
 core/data/test/psd/comparePsdAddress.h                      | 4 +---
 core/data/test/psd/comparePsdDigi.h                         | 4 +---
 core/data/test/psd/comparePsdHit.h                          | 4 +---
 core/data/test/psd/comparePsdPoint.h                        | 4 +---
 core/data/test/rich/_GTestCbmRichDigi.cxx                   | 4 +---
 core/data/test/rich/compareRichDigi.h                       | 4 +---
 core/data/test/sts/_GTestCbmStsDigi.cxx                     | 4 +---
 core/data/test/sts/compareStsDigi.h                         | 4 +---
 core/data/test/tof/_GTestCbmTofDigi.cxx                     | 4 +---
 core/data/test/tof/compareTofDigi.h                         | 4 +---
 core/data/test/trd/_GTestCbmTrdDetectorId.cxx               | 4 +---
 core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx        | 4 +---
 core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx       | 4 +---
 core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx       | 4 +---
 core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx       | 4 +---
 core/data/test/trd/_GTestCbmTrdDigi.cxx                     | 4 +---
 core/data/test/trd/_GTestCbmTrdHit.cxx                      | 4 +---
 core/data/test/trd/_GTestCbmTrdPoint.cxx                    | 4 +---
 core/data/test/trd/compareTrdDigi.h                         | 4 +---
 core/data/test/trd/compareTrdHit.h                          | 4 +---
 core/data/test/trd/compareTrdPoint.h                        | 4 +---
 core/data/trd/CbmTrdDigi.cxx                                | 4 +---
 core/data/trd/CbmTrdDigi.h                                  | 4 +---
 core/data/trd/CbmTrdRawMessageSpadic.cxx                    | 4 +---
 core/detectors/much/CbmMuchBaseLinkDef.h                    | 4 +---
 core/detectors/much/CbmMuchPad.cxx                          | 4 +---
 core/detectors/much/CbmMuchSector.cxx                       | 4 +---
 core/detectors/much/CbmMuchSectorRectangular.cxx            | 4 +---
 core/detectors/psd/CbmPsdBaseLinkDef.h                      | 4 +---
 core/detectors/psd/PolynomComplexRoots.h                    | 4 +---
 core/detectors/psd/PolynomRealRoots.h                       | 4 +---
 core/detectors/psd/PronyFitter.cxx                          | 4 +---
 core/detectors/rich/CbmMcbm2018RichPar.cxx                  | 4 +---
 core/detectors/rich/CbmMcbm2018RichPar.h                    | 4 +---
 core/detectors/rich/CbmRichBaseLinkDef.h                    | 4 +---
 core/detectors/rich/CbmRichDraw.h                           | 4 +---
 core/detectors/sts/CbmStsBaseLinkDef.h                      | 4 +---
 core/detectors/tof/CbmTofCell.cxx                           | 4 +---
 core/detectors/tof/CbmTofCell.h                             | 4 +---
 core/detectors/tof/CbmTofContFact.h                         | 4 +---
 core/detectors/tof/CbmTofDigiPar.cxx                        | 4 +---
 core/detectors/tof/CbmTofDigiPar.h                          | 4 +---
 core/detectors/tof/TTrbHeader.cxx                           | 4 +---
 core/detectors/tof/TTrbHeader.h                             | 4 +---
 core/detectors/trd/CbmMcbm2020TrdTshiftPar.h                | 4 +---
 core/detectors/trd/CbmTrdBaseLinkDef.h                      | 4 +---
 core/detectors/trd/CbmTrdContFact.h                         | 4 +---
 core/detectors/trd/CbmTrdFASP.cxx                           | 4 +---
 core/detectors/trd/CbmTrdFASP.h                             | 4 +---
 core/detectors/trd/CbmTrdGas.cxx                            | 3 ---
 core/detectors/trd/CbmTrdGas.h                              | 3 ---
 core/detectors/trd/CbmTrdLinkDef.h                          | 4 +---
 core/detectors/trd/CbmTrdModuleAbstract.cxx                 | 4 +---
 core/detectors/trd/CbmTrdModuleAbstract.h                   | 4 +---
 core/detectors/trd/CbmTrdParAsic.cxx                        | 4 +---
 core/detectors/trd/CbmTrdParAsic.h                          | 4 +---
 core/detectors/trd/CbmTrdParFasp.cxx                        | 4 +---
 core/detectors/trd/CbmTrdParFasp.h                          | 4 +---
 core/detectors/trd/CbmTrdParMod.cxx                         | 4 +---
 core/detectors/trd/CbmTrdParMod.h                           | 4 +---
 core/detectors/trd/CbmTrdParModDigi.cxx                     | 4 +---
 core/detectors/trd/CbmTrdParModDigi.h                       | 4 +---
 core/detectors/trd/CbmTrdParModGain.cxx                     | 5 ++---
 core/detectors/trd/CbmTrdParModGain.h                       | 4 +---
 core/detectors/trd/CbmTrdParModGas.cxx                      | 4 +---
 core/detectors/trd/CbmTrdParModGas.h                        | 4 +---
 core/detectors/trd/CbmTrdParModGeo.cxx                      | 4 +---
 core/detectors/trd/CbmTrdParModGeo.h                        | 4 +---
 core/detectors/trd/CbmTrdParSet.cxx                         | 4 +---
 core/detectors/trd/CbmTrdParSet.h                           | 4 +---
 core/detectors/trd/CbmTrdParSetAsic.cxx                     | 4 +---
 core/detectors/trd/CbmTrdParSetAsic.h                       | 4 +---
 core/detectors/trd/CbmTrdParSetDigi.cxx                     | 4 +---
 core/detectors/trd/CbmTrdParSetDigi.h                       | 4 +---
 core/detectors/trd/CbmTrdParSetGain.cxx                     | 4 +---
 core/detectors/trd/CbmTrdParSetGain.h                       | 4 +---
 core/detectors/trd/CbmTrdParSetGas.cxx                      | 4 +---
 core/detectors/trd/CbmTrdParSetGas.h                        | 4 +---
 core/detectors/trd/CbmTrdParSetGeo.cxx                      | 4 +---
 core/detectors/trd/CbmTrdParSetGeo.h                        | 4 +---
 core/detectors/trd/CbmTrdParSpadic.cxx                      | 4 +---
 core/detectors/trd/CbmTrdParSpadic.h                        | 4 +---
 core/detectors/trd/CbmTrdSPADIC.cxx                         | 4 +---
 core/detectors/trd/CbmTrdUtils.h                            | 4 +---
 core/eventdisplay/CbmDisplayLinkDef.h                       | 4 +---
 core/eventdisplay/CbmPixelHitSetDraw.cxx                    | 4 +---
 core/eventdisplay/CbmPixelHitSetDraw.h                      | 4 +---
 core/field/CbmFieldCreator.cxx                              | 4 +---
 core/field/CbmFieldLinkDef.h                                | 4 +---
 core/field/CbmFieldMapData.cxx                              | 3 ---
 core/qa/CbmQaBaseLinkDef.h                                  | 4 +---
 fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h                  | 4 +---
 fles/cosy2019/parameter/CbmCosy2019ContFact.cxx             | 3 ---
 fles/cosy2019/parameter/CbmCosy2019ContFact.h               | 4 +---
 fles/flestools/CbmFlesCanvasTools.cxx                       | 4 +---
 fles/flestools/CbmFlesHistosTools.cxx                       | 4 +---
 fles/flestools/CbmFormatDecHexPrintout.cxx                  | 5 ++---
 fles/flestools/CbmFormatMsBufferPrintout.cxx                | 5 ++---
 fles/flestools/CbmFormatMsHeaderPrintout.cxx                | 5 ++---
 fles/flestools/CbmFormatTsPrintout.cxx                      | 4 +---
 fles/mcbm2018/CbmFlibMcbm2018LinkDef.h                      | 4 +---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx      | 3 ---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h        | 3 ---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx      | 4 +---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx      | 3 ---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h        | 3 ---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx      | 4 +---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx      | 4 +---
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h        | 4 +---
 fles/star2019/CbmFlibStar2019LinkDef.h                      | 4 +---
 fles/star2019/parameter/CbmStar2019ContFact.cxx             | 3 ---
 fles/star2019/parameter/CbmStar2019ContFact.h               | 4 +---
 macro/KF/DecayConfig.C                                      | 4 +---
 macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C    | 4 +---
 macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C    | 4 +---
 macro/KF/KFParticleFinderSignalTest/GetParticleName.C       | 4 +---
 macro/KF/kf_kfparticle.C                                    | 3 ---
 macro/KF/registerGeantDecays.C                              | 3 ---
 macro/KF/registerLightIons.C                                | 3 ---
 macro/KF/registerPythiaDecays.C                             | 3 ---
 macro/L1/perf.C                                             | 4 +---
 macro/L1/rec.C                                              | 4 +---
 macro/L1/sim.C                                              | 3 ---
 macro/L1/simD0.C                                            | 3 ---
 .../analysis_tree_converter/run_analysis_tree_maker.C       | 4 +---
 macro/analysis/common/at_kfpf_interface/run_at_kfpf.C       | 3 ---
 macro/analysis/common/cuts/cbm_cuts.h                       | 4 +---
 macro/analysis/common/qa/run_analysistree_qa.C              | 4 +---
 macro/analysis/conversion2/eventDisplay.C                   | 3 ---
 macro/analysis/conversion2/generator_input_file.C           | 3 ---
 macro/analysis/conversion2/run_analysis.C                   | 3 ---
 macro/analysis/conversion2/run_reco_event.C                 | 3 ---
 macro/analysis/dielectron/draw_analysis.C                   | 4 +---
 macro/analysis/dielectron/draw_analysis_all.C               | 3 ---
 macro/analysis/dielectron/draw_analysis_study.C             | 3 ---
 macro/analysis/dielectron/draw_litqa.C                      | 4 +---
 macro/analysis/dielectron/draw_mvd_xy_delta.C               | 3 ---
 macro/analysis/dielectron/hadd.C                            | 4 +---
 macro/analysis/dielectron/run_analysis.C                    | 3 ---
 macro/analysis/dielectron/run_digi.C                        | 3 ---
 macro/analysis/dielectron/run_litqa.C                       | 3 ---
 macro/analysis/dielectron/run_reco.C                        | 3 ---
 macro/analysis/dielectron/run_sim.C                         | 3 ---
 macro/analysis/flow/MergeTTree.C                            | 3 ---
 macro/analysis/flow/anaFlow.C                               | 3 ---
 macro/analysis/flow/centrality_drawReso_STS_PSD.C           | 4 +---
 .../analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C | 4 +---
 macro/analysis/flow/check_EPflattening_Qvector.C            | 4 +---
 macro/analysis/flow/eventPlane.C                            | 3 ---
 macro/analysis/flow/graph_RPreso_vsCentrality.C             | 4 +---
 macro/analysis/flow/run_reco_flow.C                         | 3 ---
 macro/analysis/flow/run_sim_flow.C                          | 3 ---
 macro/analysis/hyperons/ana_cascade.C                       | 3 ---
 macro/analysis/hyperons/ana_histo_la.C                      | 3 ---
 macro/analysis/hyperons/ana_histo_om.C                      | 3 ---
 macro/analysis/hyperons/ana_la.C                            | 3 ---
 macro/analysis/hyperons/create_histo_la.C                   | 3 ---
 macro/analysis/hyperons/create_histo_om.C                   | 3 ---
 macro/analysis/hyperons/drawM.C                             | 3 ---
 macro/analysis/hyperons/drawM_om.C                          | 3 ---
 macro/analysis/hyperons/eff.C                               | 3 ---
 macro/analysis/hyperons/eff_draw.C                          | 3 ---
 macro/analysis/hyperons/merge.C                             | 4 +---
 macro/analysis/hyperons/mix_cascade.C                       | 3 ---
 macro/analysis/hyperons/rec.C                               | 3 ---
 macro/analysis/hyperons/sela.C                              | 3 ---
 macro/analysis/hyperons/sim.C                               | 3 ---
 macro/analysis/jpsi/DecayConfig.C                           | 4 +---
 macro/analysis/jpsi/run_sim.C                               | 3 ---
 macro/analysis/jpsiana/draw_analysis_jpsi.C                 | 4 +---
 macro/analysis/jpsiana/draw_litqa.C                         | 3 ---
 macro/analysis/jpsiana/draw_superevent_jpsi.C               | 4 +---
 macro/analysis/jpsiana/hadd.C                               | 4 +---
 macro/analysis/jpsiana/run_analysis_jpsi.C                  | 3 ---
 macro/analysis/jpsiana/run_litqa_jpsi.C                     | 3 ---
 macro/analysis/jpsiana/run_reco_jpsi.C                      | 3 ---
 macro/analysis/jpsiana/run_sim_jpsi.C                       | 3 ---
 macro/analysis/jpsiana/run_superevent_jpsi.C                | 4 +---
 macro/analysis/much/ANN.C                                   | 3 ---
 macro/analysis/much/Add_histo.C                             | 3 ---
 macro/analysis/much/Correction.C                            | 3 ---
 macro/analysis/much/InvariantMassSpectra.C                  | 3 ---
 macro/analysis/much/InvariantMassSpectra_SE.C               | 3 ---
 macro/analysis/much/InvariantMassSpectra_mix.C              | 3 ---
 macro/analysis/much/Optimization.C                          | 3 ---
 macro/analysis/much/Pluto_analysis.C                        | 3 ---
 macro/analysis/much/TrackParameters.C                       | 3 ---
 macro/analysis/much/generate_DrellYan_8GeV.C                | 4 +---
 macro/analysis/opencharm/CharmSetup.C                       | 3 ---
 macro/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                  | 3 ---
 macro/analysis/opencharm/opencharm_reco.C                   | 3 ---
 macro/analysis/opencharm/opencharm_sim.C                    | 3 ---
 macro/analysis/papa/run_analysis.C                          | 3 ---
 macro/beamtime/camera_restore.C                             | 3 ---
 macro/beamtime/cern2016/MuchCreateMap.C                     | 4 +---
 macro/beamtime/cern2016/ana_digi.C                          | 3 ---
 macro/beamtime/cern2016/ana_digi_cal.C                      | 3 ---
 macro/beamtime/cern2016/dis_digi.C                          | 3 ---
 macro/beamtime/cern2016/dis_hits.C                          | 3 ---
 macro/beamtime/cern2016/rootlogon.C                         | 4 +---
 .../cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C     | 3 ---
 .../cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C     | 3 ---
 .../cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C    | 3 ---
 macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C   | 3 ---
 .../cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C       | 3 ---
 .../cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C       | 3 ---
 macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C          | 3 ---
 macro/beamtime/cosy2018/DtStackS1.C                         | 4 +---
 macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C          | 3 ---
 macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C         | 3 ---
 macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C          | 3 ---
 macro/beamtime/cosy2018/plotCosyHistos.C                    | 4 +---
 macro/beamtime/cosy2019/FindHodoOrCoinc.C                   | 4 +---
 macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C      | 4 +---
 macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C         | 4 +---
 macro/beamtime/cosy2019/FindNoisyChanSts.C                  | 5 ++---
 macro/beamtime/cosy2019/FindOffsetsCosy2019.C               | 4 +---
 macro/beamtime/cosy2019/PlotClusterCharge.C                 | 4 +---
 macro/beamtime/cosy2019/PlotCoinc.C                         | 4 +---
 macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C           | 4 +---
 macro/beamtime/cosy2019/check_coinc_Hodo.C                  | 3 ---
 macro/beamtime/cosy2019/cosy2019_calib.C                    | 3 ---
 macro/beamtime/cosy2019/cosy2019_process.C                  | 3 ---
 macro/beamtime/cosy2019/cosy2019_reco.C                     | 3 ---
 macro/beamtime/fit_yPos.C                                   | 3 ---
 macro/beamtime/fit_ybox.C                                   | 3 ---
 macro/beamtime/fit_ybox.h                                   | 3 ---
 macro/beamtime/hd2017/PlotLongRangeDate.C                   | 4 +---
 macro/beamtime/hd2017/ana_digi.C                            | 3 ---
 macro/beamtime/hd2017/ana_digi_cal.C                        | 3 ---
 macro/beamtime/hd2017/rootlogon.C                           | 4 +---
 macro/beamtime/hd2020/ana_digi_cal.C                        | 3 ---
 macro/beamtime/hd2020/ana_trks.C                            | 3 ---
 macro/beamtime/hd2020/dis_digi.C                            | 3 ---
 macro/beamtime/hd2020/dis_trks.C                            | 3 ---
 macro/beamtime/hd2020/pl_all_2D.C                           | 3 ---
 macro/beamtime/hd2020/pl_all_3D.C                           | 3 ---
 macro/beamtime/hd2020/pl_all_CluMul.C                       | 3 ---
 macro/beamtime/hd2020/pl_all_CluPosEvol.C                   | 3 ---
 macro/beamtime/hd2020/pl_all_CluRate.C                      | 3 ---
 macro/beamtime/hd2020/pl_all_CluTimeEvol.C                  | 3 ---
 macro/beamtime/hd2020/pl_all_DTLastHits.C                   | 3 ---
 macro/beamtime/hd2020/pl_all_DigiCor.C                      | 3 ---
 macro/beamtime/hd2020/pl_all_DigiDTLD.C                     | 3 ---
 macro/beamtime/hd2020/pl_all_DigiMul.C                      | 3 ---
 macro/beamtime/hd2020/pl_all_DigiStatus.C                   | 3 ---
 macro/beamtime/hd2020/pl_all_DigiTot.C                      | 3 ---
 macro/beamtime/hd2020/pl_all_Sel2D.C                        | 3 ---
 macro/beamtime/hd2020/pl_all_Track2D.C                      | 3 ---
 macro/beamtime/hd2020/pl_cmp_CluRate.C                      | 3 ---
 macro/beamtime/hd2020/rootlogon.C                           | 3 ---
 macro/beamtime/load_hst.C                                   | 3 ---
 macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C               | 4 +---
 macro/beamtime/mcbm2018/DataRateMoniPlot.C                  | 4 +---
 macro/beamtime/mcbm2018/MonitorRich.C                       | 3 ---
 macro/beamtime/mcbm2018/SpillRatePlot.C                     | 4 +---
 macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C              | 4 +---
 macro/beamtime/mcbm2018/T0MoniPlot.C                        | 4 +---
 macro/beamtime/mcbm2018/TofPulserPlot.C                     | 4 +---
 macro/beamtime/mcbm2018/ana_digi_cal.C                      | 3 ---
 macro/beamtime/mcbm2018/ana_digi_cal_all.C                  | 3 ---
 macro/beamtime/mcbm2018/ana_digi_cali.C                     | 3 ---
 macro/beamtime/mcbm2018/ana_digi_cos.C                      | 3 ---
 macro/beamtime/mcbm2018/ana_trks.C                          | 3 ---
 macro/beamtime/mcbm2018/ana_trksi.C                         | 3 ---
 macro/beamtime/mcbm2018/build_events.C                      | 4 +---
 macro/beamtime/mcbm2018/check_events.C                      | 3 ---
 macro/beamtime/mcbm2018/check_timing.C                      | 4 +---
 macro/beamtime/mcbm2018/dis_digi.C                          | 3 ---
 macro/beamtime/mcbm2018/dis_trks.C                          | 3 ---
 macro/beamtime/mcbm2018/eLinkMappingCrobSts.C               | 5 ++---
 macro/beamtime/mcbm2018/pl_all_2D.C                         | 3 ---
 macro/beamtime/mcbm2018/pl_all_CluMul.C                     | 3 ---
 macro/beamtime/mcbm2018/pl_all_CluPosEvol.C                 | 3 ---
 macro/beamtime/mcbm2018/pl_all_CluRate.C                    | 3 ---
 macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C                | 3 ---
 macro/beamtime/mcbm2018/pl_all_DigiCor.C                    | 3 ---
 macro/beamtime/mcbm2018/pl_all_Sel2D.C                      | 3 ---
 macro/beamtime/mcbm2018/pl_all_Track2D.C                    | 3 ---
 macro/beamtime/mcbm2018/pl_raw_evt.C                        | 3 ---
 macro/beamtime/mcbm2019/MonitorRich.C                       | 3 ---
 macro/beamtime/mcbm2019/build_events.C                      | 4 +---
 macro/beamtime/mcbm2019/check_events.C                      | 3 ---
 macro/beamtime/mcbm2019/check_much_digis.C                  | 3 ---
 macro/beamtime/mcbm2019/check_pulser.C                      | 3 ---
 macro/beamtime/mcbm2019/check_sts_digis.C                   | 3 ---
 macro/beamtime/mcbm2019/check_timing.C                      | 4 +---
 macro/beamtime/mcbm2019/mcbm2019_reco.C                     | 3 ---
 macro/beamtime/mcbm2019/mcbm_reco.C                         | 4 +---
 macro/beamtime/mcbm2020/MonitorRich.C                       | 3 ---
 macro/beamtime/mcbm2020/ana_digi_cal.C                      | 3 ---
 macro/beamtime/mcbm2020/ana_digi_cal_all.C                  | 3 ---
 macro/beamtime/mcbm2020/ana_digi_cali.C                     | 3 ---
 macro/beamtime/mcbm2020/ana_trks.C                          | 3 ---
 macro/beamtime/mcbm2020/ana_trks_eval.C                     | 3 ---
 macro/beamtime/mcbm2020/ana_trksi.C                         | 3 ---
 macro/beamtime/mcbm2020/build_event_win.C                   | 4 +---
 macro/beamtime/mcbm2020/build_event_win_kronos.C            | 4 +---
 macro/beamtime/mcbm2020/build_events.C                      | 4 +---
 macro/beamtime/mcbm2020/check_events.C                      | 3 ---
 macro/beamtime/mcbm2020/check_much_digis.C                  | 3 ---
 macro/beamtime/mcbm2020/check_pulser.C                      | 3 ---
 macro/beamtime/mcbm2020/check_sts_digis.C                   | 3 ---
 macro/beamtime/mcbm2020/check_timing.C                      | 4 +---
 macro/beamtime/mcbm2020/check_timing_any.C                  | 4 +---
 macro/beamtime/mcbm2020/dis_digi.C                          | 3 ---
 macro/beamtime/mcbm2020/dis_trks.C                          | 3 ---
 macro/beamtime/mcbm2020/mcbm_build_and_reco.C               | 3 ---
 macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C        | 3 ---
 macro/beamtime/mcbm2020/mcbm_event_ana.C                    | 3 ---
 macro/beamtime/mcbm2020/mcbm_event_reco.C                   | 3 ---
 macro/beamtime/mcbm2020/mcbm_event_reco_ana.C               | 3 ---
 macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C            | 3 ---
 macro/beamtime/mcbm2020/mcbm_reco.C                         | 3 ---
 macro/beamtime/mcbm2020/mcbm_reco_kronos.C                  | 3 ---
 macro/beamtime/mcbm2020/mcbm_tof_tracking.C                 | 3 ---
 macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C          | 3 ---
 macro/beamtime/mcbm2020/mrich_reco.C                        | 3 ---
 macro/beamtime/mcbm2020/mtof_build_and_reco.C               | 3 ---
 macro/beamtime/mcbm2020/mtof_build_and_reco_kronos.C        | 3 ---
 macro/beamtime/mcbm2020/mtof_reco.C                         | 3 ---
 macro/beamtime/mcbm2020/pl_all_2D.C                         | 3 ---
 macro/beamtime/mcbm2020/pl_all_3D.C                         | 3 ---
 macro/beamtime/mcbm2020/pl_all_CluMul.C                     | 3 ---
 macro/beamtime/mcbm2020/pl_all_CluPosEvol.C                 | 3 ---
 macro/beamtime/mcbm2020/pl_all_CluRate.C                    | 3 ---
 macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C                | 3 ---
 macro/beamtime/mcbm2020/pl_all_DTLastHits.C                 | 3 ---
 macro/beamtime/mcbm2020/pl_all_DigiCor.C                    | 3 ---
 macro/beamtime/mcbm2020/pl_all_DigiDTFD.C                   | 3 ---
 macro/beamtime/mcbm2020/pl_all_DigiDTLD.C                   | 3 ---
 macro/beamtime/mcbm2020/pl_all_DigiTot.C                    | 3 ---
 macro/beamtime/mcbm2020/pl_all_Sel2D.C                      | 3 ---
 macro/beamtime/mcbm2020/pl_all_Track2D.C                    | 3 ---
 macro/beamtime/mcbm2020/pl_cmp_CluRate.C                    | 3 ---
 macro/beamtime/mcbm2021/ana_digi_cal.C                      | 3 ---
 macro/beamtime/mcbm2021/ana_digi_cal_all.C                  | 3 ---
 macro/beamtime/mcbm2021/ana_trks.C                          | 3 ---
 macro/beamtime/mcbm2021/ana_trks_eval.C                     | 3 ---
 macro/beamtime/mcbm2021/dis_digi.C                          | 3 ---
 macro/beamtime/mcbm2021/pl_all_2D.C                         | 3 ---
 macro/beamtime/mcbm2021/pl_all_3D.C                         | 3 ---
 macro/beamtime/mcbm2021/pl_all_CluMul.C                     | 3 ---
 macro/beamtime/mcbm2021/pl_all_CluPosEvol.C                 | 3 ---
 macro/beamtime/mcbm2021/pl_all_CluRate.C                    | 3 ---
 macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C                | 3 ---
 macro/beamtime/mcbm2021/pl_all_DTLastHits.C                 | 3 ---
 macro/beamtime/mcbm2021/pl_all_DigiCor.C                    | 3 ---
 macro/beamtime/mcbm2021/pl_all_DigiDTFD.C                   | 3 ---
 macro/beamtime/mcbm2021/pl_all_DigiDTLD.C                   | 3 ---
 macro/beamtime/mcbm2021/pl_all_DigiMul.C                    | 3 ---
 macro/beamtime/mcbm2021/pl_all_DigiTot.C                    | 3 ---
 macro/beamtime/mcbm2021/pl_all_Sel2D.C                      | 3 ---
 macro/beamtime/mcbm2021/pl_all_Track2D.C                    | 3 ---
 macro/beamtime/mcbm2021/pl_cmp_CluRate.C                    | 3 ---
 macro/beamtime/mcbm2021/rootlogon.C                         | 3 ---
 macro/beamtime/pl_CosmicHst.C                               | 3 ---
 macro/beamtime/pl_CosmicHst1.C                              | 3 ---
 macro/beamtime/pl_Datime.C                                  | 3 ---
 macro/beamtime/pl_Dut_DTLH.C                                | 3 ---
 macro/beamtime/pl_Dut_Res.C                                 | 3 ---
 macro/beamtime/pl_Dut_Vel.C                                 | 3 ---
 macro/beamtime/pl_Eff_Chi.C                                 | 3 ---
 macro/beamtime/pl_Eff_DTLH.C                                | 3 ---
 macro/beamtime/pl_Eff_Mul.C                                 | 3 ---
 macro/beamtime/pl_Eff_TIR.C                                 | 3 ---
 macro/beamtime/pl_Eff_TIS.C                                 | 3 ---
 macro/beamtime/pl_Eff_XY_1.C                                | 3 ---
 macro/beamtime/pl_Efficiency_XY.C                           | 3 ---
 macro/beamtime/pl_EvCluMul.C                                | 3 ---
 macro/beamtime/pl_TIR.C                                     | 3 ---
 macro/beamtime/pl_TIS.C                                     | 3 ---
 macro/beamtime/pl_TIS2.C                                    | 3 ---
 macro/beamtime/pl_Track2D.C                                 | 3 ---
 macro/beamtime/pl_UHit.C                                    | 3 ---
 macro/beamtime/pl_XY_3D.C                                   | 4 +---
 macro/beamtime/pl_XY_fit.C                                  | 3 ---
 macro/beamtime/pl_XY_trk.C                                  | 3 ---
 macro/beamtime/pl_all_CalPar.C                              | 3 ---
 macro/beamtime/pl_all_CluMul.C                              | 3 ---
 macro/beamtime/pl_all_CluRate.C                             | 3 ---
 macro/beamtime/pl_all_CluRateRatio.C                        | 3 ---
 macro/beamtime/pl_all_CluSizeDTLastHits.C                   | 3 ---
 macro/beamtime/pl_all_DTLastHits.C                          | 3 ---
 macro/beamtime/pl_all_DTLastHits_CluSize.C                  | 3 ---
 macro/beamtime/pl_all_DTLastHits_Tot.C                      | 3 ---
 macro/beamtime/pl_all_DigiCor.C                             | 3 ---
 macro/beamtime/pl_all_Fpar.C                                | 3 ---
 macro/beamtime/pl_all_LHTime.C                              | 3 ---
 macro/beamtime/pl_all_Svel.C                                | 3 ---
 macro/beamtime/pl_all_TOffDTLastHits.C                      | 3 ---
 macro/beamtime/pl_all_TotDTLastHits.C                       | 3 ---
 macro/beamtime/pl_all_XY.C                                  | 3 ---
 macro/beamtime/pl_all_cluWalk.C                             | 3 ---
 macro/beamtime/pl_all_cluWalkSel.C                          | 3 ---
 macro/beamtime/pl_all_dTSel.C                               | 3 ---
 macro/beamtime/pl_ana_DTXY.C                                | 3 ---
 macro/beamtime/pl_ana_DXXY.C                                | 3 ---
 macro/beamtime/pl_ana_DYXY.C                                | 3 ---
 macro/beamtime/pl_calib_trk.C                               | 3 ---
 macro/beamtime/pl_cmp_1D.C                                  | 3 ---
 macro/beamtime/pl_cmp_Eff.C                                 | 3 ---
 macro/beamtime/pl_cor_walk.C                                | 4 +---
 macro/beamtime/pl_eff_XY.C                                  | 3 ---
 macro/beamtime/pl_ext_SUT.C                                 | 3 ---
 macro/beamtime/pl_ext_dXdY.C                                | 3 ---
 macro/beamtime/pl_ext_over.C                                | 3 ---
 macro/beamtime/pl_ext_trk.C                                 | 3 ---
 macro/beamtime/pl_over_Mat04D4best.C                        | 3 ---
 macro/beamtime/pl_over_MatD4sel.C                           | 3 ---
 macro/beamtime/pl_over_Walk2.C                              | 3 ---
 macro/beamtime/pl_over_XX.C                                 | 3 ---
 macro/beamtime/pl_over_clu.C                                | 3 ---
 macro/beamtime/pl_over_cluSel.C                             | 3 ---
 macro/beamtime/pl_over_cor.C                                | 3 ---
 macro/beamtime/pl_over_deltof.C                             | 3 ---
 macro/beamtime/pl_over_get4.C                               | 3 ---
 macro/beamtime/pl_over_off.C                                | 3 ---
 macro/beamtime/pl_over_pos.C                                | 3 ---
 macro/beamtime/pl_over_toff.C                               | 3 ---
 macro/beamtime/pl_over_trk.C                                | 3 ---
 macro/beamtime/pl_pull_trk.C                                | 3 ---
 macro/beamtime/pl_rate_trkl.C                               | 3 ---
 macro/beamtime/pl_raw_evt.C                                 | 3 ---
 macro/beamtime/pl_rel_ratio.C                               | 4 +---
 macro/beamtime/pl_resi2D_trk.C                              | 3 ---
 macro/beamtime/pl_star_DigiCor.C                            | 3 ---
 macro/beamtime/pl_trk_Walk.C                                | 3 ---
 macro/beamtime/pl_trk_cal_walk.C                            | 3 ---
 macro/beamtime/pl_vert_trk.C                                | 3 ---
 macro/beamtime/save_hst.C                                   | 3 ---
 macro/beamtime/star2017/ana_digi.C                          | 3 ---
 macro/beamtime/star2017/ana_digi_cal.C                      | 3 ---
 macro/beamtime/star2017/dis_digi.C                          | 3 ---
 macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C        | 3 ---
 macro/beamtime/star2017/pl_all_CluMul.C                     | 3 ---
 macro/beamtime/star2017/pl_all_CluRate.C                    | 3 ---
 macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C          | 3 ---
 macro/beamtime/star2017/pl_all_DTLastHits.C                 | 3 ---
 macro/beamtime/star2017/pl_all_TOffDTLastHits.C             | 3 ---
 macro/beamtime/star2017/pl_all_TotDTLastHits.C              | 3 ---
 macro/beamtime/star2017/rootlogon.C                         | 4 +---
 macro/beamtime/star2018/ana_digi.C                          | 3 ---
 macro/beamtime/star2018/ana_digi_cal.C                      | 3 ---
 macro/beamtime/star2018/dis_digi.C                          | 3 ---
 macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C        | 3 ---
 macro/beamtime/star2018/pl_all_CluMul.C                     | 3 ---
 macro/beamtime/star2018/pl_all_CluRate.C                    | 3 ---
 macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C          | 3 ---
 macro/beamtime/star2018/pl_all_DTLastHits.C                 | 3 ---
 macro/beamtime/star2018/pl_all_TOffDTLastHits.C             | 3 ---
 macro/beamtime/star2018/pl_all_TotDTLastHits.C              | 3 ---
 macro/beamtime/star2018/rootlogon.C                         | 4 +---
 macro/beamtime/star2019/inspect_latency_histo.C             | 3 ---
 macro/beamtime/star2019/inspect_shift_histo.C               | 3 ---
 macro/beamtime/star2019/inspect_sync_histo.C                | 3 ---
 macro/beamtime/tests/TofCernFeb15Calib.C                    | 4 +---
 macro/beamtime/tests/TofCernFeb15Run.C                      | 4 +---
 macro/beamtime/tests/TofCernNov15Calib.C                    | 4 +---
 macro/beamtime/tests/TofCernNov15Run.C                      | 4 +---
 macro/dimuon/invM.C                                         | 3 ---
 macro/ecal/run_reco.C                                       | 3 ---
 macro/ecal/run_sim.C                                        | 3 ---
 macro/fhodo/Create_mapping_parameters.C                     | 4 +---
 macro/field/FieldMapTest.C                                  | 3 ---
 macro/field/checkFieldMap.C                                 | 3 ---
 macro/field/checkFieldSym.C                                 | 3 ---
 macro/field/checkFields.C                                   | 3 ---
 macro/field/createDistorted.C                               | 5 ++---
 macro/field/createFieldMap.C                                | 3 ---
 macro/field/drawField.C                                     | 4 +---
 macro/fles/PlotChRate.C                                     | 3 ---
 macro/fles/PlotEventBuilder.C                               | 3 ---
 macro/fles/PlotMap.C                                        | 4 +---
 macro/fles/PlotTimeEvo.C                                    | 3 ---
 macro/fles/call_Tsa_client.C                                | 3 ---
 macro/fles/call_Tsa_client_Cruz.C                           | 3 ---
 macro/fles/data/readHistosFromFile.C                        | 4 +---
 macro/fles/get4/PlotChRate.C                                | 3 ---
 macro/fles/get4/PlotEpochJumps.C                            | 3 ---
 macro/fles/get4/PlotEventBuilder.C                          | 3 ---
 macro/fles/get4/PlotFtEdgesRatio.C                          | 5 ++---
 macro/fles/get4/PlotMap.C                                   | 4 +---
 macro/fles/get4/PlotMultiDet.C                              | 4 +---
 macro/fles/get4/PlotMultiDetDist.C                          | 4 +---
 macro/fles/get4/PlotMultiDetTot.C                           | 4 +---
 macro/fles/get4/PlotPulsCt.C                                | 3 ---
 macro/fles/get4/PlotPulsDist.C                              | 3 ---
 macro/fles/get4/PlotPulsFtDt.C                              | 3 ---
 macro/fles/get4/PlotPulsMulti.C                             | 3 ---
 macro/fles/get4/PlotPulsMultiDist.C                         | 3 ---
 macro/fles/get4/PlotPulsMultiTot.C                          | 3 ---
 macro/fles/get4/PlotPulsRes.C                               | 4 +---
 macro/fles/get4/PlotPulsResEnc.C                            | 4 +---
 macro/fles/get4/PlotPulsResTot.C                            | 4 +---
 macro/fles/get4/PlotTimeEvo.C                               | 3 ---
 macro/fles/get4/rootlogon.C                                 | 3 ---
 macro/fles/readNxTsa.C                                      | 4 +---
 macro/fles/readTsaFexOffline.C                              | 5 ++---
 macro/fles/readTsaTimeOffline.C                             | 3 ---
 macro/fles/readTsa_file_stsxyter.C                          | 4 +---
 macro/generators/run_CbmIonGenerator.C                      | 3 ---
 macro/generators/run_pluto.C                                | 3 ---
 macro/geometry/check_media.C                                | 3 ---
 macro/geometry/create_medialist.C                           | 4 +---
 macro/geometry/create_positionlist.C                        | 4 +---
 macro/geometry/print_medialist.C                            | 4 +---
 macro/global/Merger.C                                       | 4 +---
 macro/hadron/acceptance.C                                   | 5 ++---
 macro/hadron/draw.C                                         | 3 ---
 macro/hadron/drawStyle.C                                    | 4 +---
 macro/hadron/draw_reco.C                                    | 5 ++---
 macro/hadron/draw_run.C                                     | 4 +---
 macro/hadron/fillm2.C                                       | 4 +---
 macro/hadron/fitm2.C                                        | 4 +---
 macro/hadron/produceDst.C                                   | 4 +---
 macro/hadron/reco.urqmd.C                                   | 4 +---
 macro/hadron/run.urqmd.C                                    | 4 +---
 macro/hadron/spectra.urqmd.C                                | 4 +---
 macro/hadron/yields.urqmd.C                                 | 4 +---
 macro/htrack/Style.C                                        | 4 +---
 macro/htrack/runHoughStsTrackFinder.C                       | 3 ---
 macro/htrack/runProduceFile.C                               | 3 ---
 macro/kronos/histos/CalculateEfficiency.C                   | 4 +---
 macro/kronos/macro/run_mc.C                                 | 3 ---
 macro/littrack/clustering/test_much_vis.C                   | 3 ---
 macro/littrack/eloss_ana.C                                  | 3 ---
 macro/littrack/eloss_sim.C                                  | 3 ---
 macro/littrack/fit_speed.C                                  | 3 ---
 macro/littrack/phys.C                                       | 4 +---
 macro/littrack/radlength_sim.C                              | 3 ---
 macro/littrack/scripts/much/check_files.C                   | 3 ---
 macro/littrack/scripts/much/much_ana.C                      | 4 +---
 macro/littrack/test_matrix_math.C                           | 3 ---
 macro/mcbm/eventDisplay.C                                   | 3 ---
 macro/mcbm/eventDisplay_reco.C                              | 3 ---
 macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C         | 3 ---
 macro/mcbm/geometry/hodo/test_hodogeo_reco.C                | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C       | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C        | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C   | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C   | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C   | 3 ---
 macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C   | 3 ---
 macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C            | 4 +---
 macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C            | 4 +---
 macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C            | 4 +---
 macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C         | 4 +---
 macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C            | 3 ---
 macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C            | 3 ---
 macro/mcbm/geometry/targetbox/ctub_orig.C                   | 4 +---
 macro/mcbm/geometry/targetbox/cutout1.C                     | 4 +---
 macro/mcbm/geometry/targetbox/cutout2.C                     | 4 +---
 macro/mcbm/geometry/targetbox/targetbox1.C                  | 4 +---
 macro/mcbm/geometry/targetbox/targetbox2.C                  | 4 +---
 macro/mcbm/geometry/targetbox/targetbox3.C                  | 4 +---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C        | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C        | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C        | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C        | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C     | 3 ---
 macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C     | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C       | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C       | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C       | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C       | 4 +---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C          | 3 ---
 macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C          | 3 ---
 macro/mcbm/legacy/eventDisplay.C                            | 3 ---
 macro/mcbm/legacy/mcbm_mc.C                                 | 3 ---
 macro/mcbm/legacy/mcbm_mc_dev.C                             | 3 ---
 macro/mcbm/legacy/mcbm_mc_gp.C                              | 3 ---
 macro/mcbm/legacy/mcbm_mc_nh.C                              | 3 ---
 macro/mcbm/legacy/mcbm_sim.C                                | 3 ---
 macro/mcbm/matbudget_ana_mcbm_mvd.C                         | 4 +---
 macro/mcbm/matbudget_ana_mcbm_sts.C                         | 4 +---
 macro/mcbm/matbudget_mc_mcbm_mvd.C                          | 3 ---
 macro/mcbm/matbudget_mc_mcbm_sts.C                          | 3 ---
 macro/mcbm/mcbm_Ana.C                                       | 3 ---
 macro/mcbm/mcbm_check_materials.C                           | 3 ---
 macro/mcbm/mcbm_check_overlaps.C                            | 3 ---
 macro/mcbm/mcbm_display_event.C                             | 3 ---
 macro/mcbm/mcbm_hadron_analysis.C                           | 3 ---
 macro/mcbm/mcbm_hadron_analysis_nh.C                        | 3 ---
 macro/mcbm/mcbm_match_check.C                               | 3 ---
 macro/mcbm/mcbm_mc_nh.C                                     | 3 ---
 macro/mcbm/mcbm_pribeam.C                                   | 3 ---
 macro/mcbm/mcbm_qa.C                                        | 3 ---
 macro/mcbm/mcbm_qa_nh.C                                     | 3 ---
 macro/mcbm/mcbm_reco.C                                      | 3 ---
 macro/mcbm/mcbm_reco_dev.C                                  | 3 ---
 macro/mcbm/mcbm_reco_event.C                                | 3 ---
 macro/mcbm/mcbm_reco_event_tb.C                             | 3 ---
 macro/mcbm/mcbm_reco_event_tb_nh.C                          | 3 ---
 macro/mcbm/mcbm_reco_gp.C                                   | 3 ---
 macro/mcbm/mcbm_reco_nh.C                                   | 3 ---
 macro/mcbm/pl_lambda.C                                      | 3 ---
 macro/mcbm/save_hst.C                                       | 4 +---
 macro/mcbm/sps17_mc.C                                       | 3 ---
 macro/much/add_histo.C                                      | 3 ---
 macro/much/draw_histo.C                                     | 3 ---
 macro/much/geometry/create_MUCH_geometry_v17a.C             | 3 ---
 macro/much/geometry/create_MUCH_geometry_v17b.C             | 3 ---
 macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C        | 3 ---
 macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C        | 3 ---
 macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C        | 3 ---
 macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C        | 3 ---
 macro/much/geometry/create_Much_geo_v17b.C                  | 3 ---
 macro/much/much_draw3D.C                                    | 4 +---
 macro/much/much_histo_style.C                               | 4 +---
 macro/much/much_hitsQa.C                                    | 3 ---
 macro/much/much_hits_gem.C                                  | 3 ---
 macro/much/run_ana.C                                        | 3 ---
 macro/mvd/digitise.C                                        | 3 ---
 macro/mvd/digitise_and_HitReco.C                            | 3 ---
 macro/mvd/geometry/Create_Simple_MVD_Geometry.C             | 3 ---
 macro/mvd/mvd_CbmUniGen_reco_cluster.C                      | 3 ---
 macro/mvd/mvd_CbmUniGen_sim_cluster.C                       | 3 ---
 macro/mvd/mvd_analyse.C                                     | 5 ++---
 macro/mvd/mvd_reco.C                                        | 3 ---
 macro/mvd/mvd_sim.C                                         | 3 ---
 macro/mvd/mvd_transDelta.C                                  | 3 ---
 macro/mvd/qa/mvd_digitize_for_debugging.C                   | 3 ---
 macro/mvd/qa/mvd_qa1_transUrqmd.C                           | 3 ---
 macro/mvd/qa/mvd_qa2_transDelta.C                           | 3 ---
 macro/mvd/qa/mvd_qa3_digitize.C                             | 3 ---
 macro/mvd/qa/mvd_qa4_reco.C                                 | 3 ---
 macro/obsolete/drawGLTracks.C                               | 4 +---
 macro/obsolete/lhetrack.C                                   | 3 ---
 macro/obsolete/run_reco_flow.C                              | 3 ---
 macro/obsolete/run_sim_flow.C                               | 3 ---
 macro/passive/pipe_v16a_mvdsts100.h                         | 5 ++---
 macro/psd/build_correlations_tof.C                          | 4 +---
 macro/rich/CbmRichHitsProd.C                                | 5 ++---
 macro/rich/CbmRichTestHits.C                                | 3 ---
 macro/rich/CbmRichTestSim.C                                 | 3 ---
 macro/rich/alignment/Draw/Comp_Hist.C                       | 4 +---
 macro/rich/alignment/Draw/Draw_Proj.C                       | 4 +---
 macro/rich/alignment/Draw/Draw_lit_reco_qa.C                | 4 +---
 macro/rich/alignment/Draw/draw_lit_reco_qa_matching.C       | 4 +---
 macro/rich/alignment/Draw/draw_lit_reco_qa_position.C       | 4 +---
 .../rich/alignment/Draw/draw_qa/draw_lit_reco_qa_matching.C | 4 +---
 .../rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position.C | 4 +---
 .../alignment/Draw/draw_qa/draw_lit_reco_qa_position_2.C    | 4 +---
 .../alignment/Draw/draw_qa/draw_lit_reco_qa_position_3.C    | 4 +---
 macro/rich/alignment/Draw/test_add.C                        | 3 ---
 macro/rich/alignment/DrawHistograms_New.C                   | 4 +---
 macro/rich/alignment/Read_Geo/ReadGeoManager_New.C          | 4 +---
 .../alignment/Sim_Thesis/Results_Chap_6.2/run_reco_align.C  | 3 ---
 macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_sim.C  | 3 ---
 .../Sim_Thesis/create_rich_geo_with_mirror_misalignment.C   | 3 ---
 macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa.C          | 4 +---
 macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019.C  | 4 +---
 .../alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019_8AGeV.C   | 4 +---
 macro/rich/alignment/Sim_Thesis/eventDisplay.C              | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco.C                  | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_2.C                | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_3.C                | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_4.C                | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C      | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C     | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C          | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_alignment.C        | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_backup.C           | 3 ---
 macro/rich/alignment/Sim_Thesis/run_reco_correction.C       | 3 ---
 macro/rich/alignment/Sim_Thesis/run_sim.C                   | 3 ---
 macro/rich/alignment/Sim_Thesis/run_sim_2.C                 | 3 ---
 macro/rich/alignment/Sim_Thesis/run_sim_3.C                 | 3 ---
 macro/rich/alignment/Sim_Thesis/run_sim_4.C                 | 3 ---
 macro/rich/alignment/Sim_Thesis/run_sim_5.C                 | 3 ---
 macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C           | 3 ---
 macro/rich/alignment/Sim_Thesis/scaleHistos.C               | 4 +---
 macro/rich/alignment/eventDisplay.C                         | 4 +---
 macro/rich/alignment/eventDisplay1.C                        | 4 +---
 macro/rich/alignment/gauss_distrib/eventDisplay.C           | 3 ---
 macro/rich/alignment/gauss_distrib/run_reco.C               | 3 ---
 macro/rich/alignment/gauss_distrib/run_reco_alignment.C     | 3 ---
 macro/rich/alignment/gauss_distrib/run_reco_correction.C    | 3 ---
 macro/rich/alignment/gauss_distrib/run_sim.C                | 3 ---
 macro/rich/alignment/gauss_distrib/scaleHistos.C            | 4 +---
 .../alignment/inner_outer_region_study/run_mirror_reco.C    | 3 ---
 .../inner_outer_region_study/run_mirror_reco_alignment.C    | 3 ---
 .../run_mirror_reco_alignment_test.C                        | 3 ---
 .../inner_outer_region_study/run_mirror_reco_correction.C   | 3 ---
 .../run_mirror_reco_correction_test.C                       | 3 ---
 .../alignment/inner_outer_region_study/run_mirror_sim.C     | 3 ---
 .../inner_outer_region_study/run_mirror_sim_test.C          | 3 ---
 macro/rich/alignment/matching/Analyze_matching.C            | 4 +---
 macro/rich/alignment/matching/Analyze_matching.h            | 4 +---
 macro/rich/alignment/matching/calc.C                        | 3 ---
 macro/rich/alignment/matching/eventDisplay.C                | 4 +---
 macro/rich/alignment/matching/run_reco_matching.C           | 3 ---
 macro/rich/alignment/matching/run_reco_matching_alignment.C | 3 ---
 .../rich/alignment/matching/run_reco_matching_correction.C  | 3 ---
 macro/rich/alignment/matching/run_sim_matching.C            | 3 ---
 macro/rich/alignment/matching/run_sim_matching2.C           | 3 ---
 macro/rich/alignment/position/Compute_distance.C            | 4 +---
 macro/rich/alignment/position/Compute_distance.h            | 4 +---
 macro/rich/alignment/position/calc.C                        | 3 ---
 macro/rich/alignment/position/eventDisplay.C                | 4 +---
 macro/rich/alignment/position/run_reco_position.C           | 3 ---
 macro/rich/alignment/position/run_reco_position2.C          | 3 ---
 macro/rich/alignment/position/run_reco_position3.C          | 3 ---
 macro/rich/alignment/position/run_reco_position4.C          | 3 ---
 macro/rich/alignment/position/run_reco_position_old.C       | 3 ---
 macro/rich/alignment/position/run_sim_position.C            | 3 ---
 macro/rich/alignment/position/run_sim_position2.C           | 3 ---
 macro/rich/alignment/position/run_sim_position3.C           | 3 ---
 macro/rich/alignment/position/run_sim_position4.C           | 3 ---
 macro/rich/alignment/position/run_sim_position_old.C        | 3 ---
 macro/rich/alignment/run_alignment_reco.C                   | 3 ---
 macro/rich/alignment/run_correction_reco.C                  | 3 ---
 macro/rich/alignment/run_mirror_reco.C                      | 3 ---
 macro/rich/alignment/run_mirror_reco_alignment.C            | 3 ---
 macro/rich/alignment/run_mirror_reco_correction.C           | 4 +---
 macro/rich/alignment/run_mirror_sim.C                       | 3 ---
 macro/rich/alignment/run_reco.C                             | 3 ---
 macro/rich/alignment/run_sim.C                              | 3 ---
 macro/rich/alignment/single_tile/eventDisplay.C             | 3 ---
 macro/rich/alignment/single_tile/run_reco.C                 | 3 ---
 macro/rich/alignment/single_tile/run_reco_alignment.C       | 3 ---
 macro/rich/alignment/single_tile/run_reco_correction.C      | 3 ---
 macro/rich/alignment/single_tile/run_sim.C                  | 3 ---
 macro/rich/cbmlibs.C                                        | 4 +---
 macro/rich/create_RICH_geo_file.C                           | 3 ---
 macro/rich/create_rich_geo_with_mirror_misalignment.C       | 3 ---
 macro/rich/d0/run_d0.C                                      | 4 +---
 macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C     | 3 ---
 .../geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C    | 3 ---
 macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C     | 3 ---
 .../geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C     | 3 ---
 .../RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C  | 3 ---
 .../RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C  | 3 ---
 .../RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C        | 3 ---
 macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C     | 3 ---
 .../geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C     | 3 ---
 macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C  | 4 +---
 macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C            | 3 ---
 macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C           | 4 +---
 macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C            | 4 +---
 macro/rich/geotest/RotPMT/eventDisplay.C                    | 5 ++---
 .../geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C   | 3 ---
 .../TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C      | 3 ---
 macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C  | 3 ---
 macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C          | 3 ---
 macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C         | 3 ---
 macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C          | 3 ---
 macro/rich/geotest/geoopt/create_geos.C                     | 3 ---
 macro/rich/geotest/geoopt/run_geotest_opt.C                 | 3 ---
 macro/rich/geotest/run_ana_geo_opt.C                        | 4 +---
 macro/rich/geotest/run_digi_geotest.C                       | 3 ---
 macro/rich/geotest/run_digi_urqmdtest.C                     | 3 ---
 macro/rich/geotest/run_qa_geotest.C                         | 4 +---
 macro/rich/geotest/run_qa_urqmdtest.C                       | 3 ---
 macro/rich/geotest/run_reco_geo_opt.C                       | 4 +---
 macro/rich/geotest/run_reco_geotest.C                       | 4 +---
 macro/rich/geotest/run_reco_urqmdtest.C                     | 3 ---
 macro/rich/geotest/run_sim_geo_opt.C                        | 3 ---
 macro/rich/geotest/run_sim_geotest.C                        | 3 ---
 macro/rich/geotest/run_sim_urqmdtest.C                      | 3 ---
 macro/rich/mcbm/beamtime/run_aerogel_analysis.C             | 3 ---
 macro/rich/mcbm/beamtime/run_reco_mcbm_real.C               | 4 +---
 macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C          | 3 ---
 macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_dec19.C    | 3 ---
 macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_mar20.C    | 3 ---
 macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_nov19.C    | 3 ---
 macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C           | 4 +---
 macro/rich/mcbm/drawHistos.C                                | 3 ---
 macro/rich/mcbm/draw_mcbm_rich_qa.C                         | 3 ---
 macro/rich/mcbm/eventDisplay.C                              | 3 ---
 macro/rich/mcbm/mcbm_mc_gp.C                                | 3 ---
 macro/rich/mcbm/mcbm_reco_gp.C                              | 3 ---
 macro/rich/mcbm/run_reco_mcbm.C                             | 4 +---
 macro/rich/mcbm/run_sim_mcbm.C                              | 4 +---
 macro/rich/mcbm/test_daq.C                                  | 3 ---
 macro/rich/mirrors/run_ronchi.C                             | 3 ---
 macro/rich/prototype/PID.C                                  | 5 ++---
 macro/rich/prototype/angle.C                                | 5 ++---
 .../beamtime/Fall2015/Correction_building/FilterMultiPeak.C | 3 ---
 .../beamtime/Fall2015/Correction_building/buildDeltaTable.C | 3 ---
 .../Fall2015/Correction_building/entriesCounter_simple.C    | 3 ---
 .../Fall2015/beamtime_laser_analysis/buildDeltaTable.C      | 3 ---
 .../beamtime_laser_analysis/entriesCounter_simple.C         | 3 ---
 .../beamtime/Fall2015/corrections_analysis/drawAllHisto3.C  | 3 ---
 .../beamtime/Fall2015/corrections_analysis/drawDist.C       | 3 ---
 .../beamtime/Fall2015/corrections_analysis/drawInTime.C     | 3 ---
 .../beamtime/Fall2015/corrections_analysis/printMean.C      | 4 +---
 macro/rich/prototype/beamtime/Fall2015/run_analysis.C       | 3 ---
 .../prototype/beamtime/Fall2015/run_analysis_calibrate.C    | 3 ---
 .../prototype/beamtime/Fall2015/run_analysis_ringscan.C     | 3 ---
 .../prototype/beamtime/Fall2015/run_analysis_ringscan2.C    | 3 ---
 .../beamtime/Fall2015/support_macros/FilterMultiPeak.C      | 4 +---
 .../beamtime/Fall2015/support_macros/drawAlHistograms.C     | 3 ---
 .../beamtime/Fall2015/support_macros/drawAllHisto3.C        | 3 ---
 .../beamtime/Fall2015/support_macros/drawAllHisto4.C        | 3 ---
 .../beamtime/Fall2015/support_macros/drawNonShityHistos.C   | 4 +---
 .../beamtime/Fall2015/support_macros/draw_overlap.C         | 3 ---
 .../beamtime/Fall2015/support_macros/entriesCounter.C       | 3 ---
 .../beamtime/Fall2015/support_macros/histoRemove.C          | 3 ---
 .../prototype/beamtime/Fall2015/support_macros/testtest.C   | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/doDraw.C          | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/doScan.C          | 4 +---
 macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C    | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C   | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C   | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/dumpHLD.cpp       | 4 +---
 macro/rich/prototype/beamtime/NewUnpacker/printMean.C       | 4 +---
 macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C   | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C   | 3 ---
 .../prototype/beamtime/NewUnpacker/run_analysis_single.C    | 3 ---
 .../prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C  | 3 ---
 macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C | 3 ---
 .../rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C | 3 ---
 .../prototype/beamtime/NewUnpacker/run_analysis_wu_2_ip.C   | 3 ---
 .../beamtime/NewUnpacker/spectra_from_data/drawSpectra.C    | 4 +---
 macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C     | 3 ---
 macro/rich/prototype/beamtime/Nov2015/FitExpo.C             | 3 ---
 macro/rich/prototype/beamtime/Nov2015/buildDeltaTable.C     | 4 +---
 macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C   | 3 ---
 macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C       | 3 ---
 macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C  | 3 ---
 macro/rich/prototype/beamtime/Nov2015/integrate.C           | 4 +---
 macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C  | 3 ---
 macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C | 3 ---
 macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C  | 3 ---
 macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C | 3 ---
 macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C  | 3 ---
 macro/rich/prototype/beamtime/draw_analysis.C               | 4 +---
 macro/rich/prototype/beamtime/draw_study_report.C           | 4 +---
 macro/rich/prototype/beamtime/run_analysis.C                | 3 ---
 macro/rich/prototype/beamtime/run_analysis2.C               | 3 ---
 macro/rich/prototype/draw.C                                 | 5 ++---
 macro/rich/prototype/efficiency.C                           | 5 ++---
 macro/rich/prototype/geometry.C                             | 5 ++---
 macro/rich/prototype/run_ascii_generator.C                  | 4 +---
 macro/rich/prototype/run_reco.C                             | 4 +---
 macro/rich/prototype/run_sim.C                              | 3 ---
 .../prototype/smallprototype/cosy17/create_geo_cosy17.C     | 4 +---
 .../smallprototype/cosy17/draw_study_report_cosy17.C        | 3 ---
 .../smallprototype/cosy17/run_ascii_generator_cosy17.C      | 4 +---
 .../rich/prototype/smallprototype/cosy17/run_reco_cosy17.C  | 3 ---
 macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C | 4 +---
 .../prototype/smallprototype/create_geo_smallprototype.C    | 4 +---
 macro/rich/prototype/smallprototype/draw_study_report.C     | 3 ---
 macro/rich/prototype/smallprototype/run_ascii_generator.C   | 4 +---
 macro/rich/prototype/smallprototype/run_reco.C              | 4 +---
 macro/rich/prototype/smallprototype/run_sim.C               | 3 ---
 macro/rich/prototype/spectrum.C                             | 6 +++---
 macro/rich/run/draw_litqa.C                                 | 3 ---
 macro/rich/run/run_digi.C                                   | 3 ---
 macro/rich/run/run_qa.C                                     | 3 ---
 macro/rich/run/run_reco.C                                   | 3 ---
 macro/rich/run/run_transport.C                              | 3 ---
 macro/rich/timebased/run_rich_digi_tb.C                     | 5 ++---
 macro/rich/timebased/run_rich_reco_tb.C                     | 4 +---
 macro/rich/timebased/run_rich_sim_tb.C                      | 4 +---
 macro/run/checkFieldMap.C                                   | 3 ---
 macro/run/checkFieldSym.C                                   | 3 ---
 macro/run/checkFields.C                                     | 3 ---
 macro/run/check_overlaps.C                                  | 3 ---
 macro/run/draw.C                                            | 3 ---
 macro/run/eventDisplay.C                                    | 3 ---
 macro/run/run_qa.C                                          | 3 ---
 macro/run/run_qa_old.C                                      | 3 ---
 macro/run/run_reco_event.C                                  | 3 ---
 macro/run/run_recoqa_tb_track.C                             | 3 ---
 macro/run/run_transport_qa.C                                | 3 ---
 macro/simcheck/checkSimField.C                              | 3 ---
 macro/sts/Occupancy.C                                       | 3 ---
 macro/sts/draw_qa_reco.C                                    | 3 ---
 macro/sts/draw_qa_sim.C                                     | 3 ---
 macro/sts/geometry/create_STS_geo_file.C                    | 4 +---
 macro/sts/geometry/create_positionlist_plus4.C              | 4 +---
 macro/sts/matbudget_ana.C                                   | 4 +---
 macro/sts/matbudget_ana_phi.C                               | 4 +---
 macro/sts/matbudget_mc.C                                    | 3 ---
 macro/sts/matbudget_mc_phi.C                                | 3 ---
 macro/sts/qa_reco.C                                         | 3 ---
 macro/sts/qa_sim.C                                          | 3 ---
 macro/sts/sts_Qa.C                                          | 3 ---
 macro/sts/sts_digi.C                                        | 3 ---
 macro/sts/sts_reco.C                                        | 3 ---
 macro/sts/sts_reco_all.C                                    | 3 ---
 macro/sts/sts_reco_ideal.C                                  | 3 ---
 macro/sts/sts_reco_raw.C                                    | 3 ---
 macro/sts/sts_sim.C                                         | 3 ---
 macro/sts/sts_sim_auau.C                                    | 3 ---
 macro/sts/sts_sim_pau.C                                     | 3 ---
 macro/sts/sts_sim_single.C                                  | 3 ---
 macro/sts/sts_transport.C                                   | 3 ---
 macro/tof/CbmTofHitsProd.C                                  | 4 +---
 macro/tof/TOF_test.C                                        | 3 ---
 macro/tof/Tof_QA.C                                          | 3 ---
 macro/tof/anaTof100.C                                       | 4 +---
 macro/tof/beamtime/apr14/ana_digi.C                         | 3 ---
 macro/tof/beamtime/apr14/ana_digi_Sun2325.C                 | 3 ---
 macro/tof/beamtime/apr14/ana_lmd.C                          | 3 ---
 macro/tof/beamtime/apr14/currents/CurrRateHd.C              | 4 +---
 macro/tof/beamtime/apr14/currents/StructDef.h               | 5 ++---
 macro/tof/beamtime/apr14/currents/currentPlot.C             | 5 ++---
 macro/tof/beamtime/apr14/currents/currentPlotHd.C           | 5 ++---
 macro/tof/beamtime/apr14/currents/currentTreeConv.C         | 5 ++---
 macro/tof/beamtime/apr14/currents/hvScalUseExample.C        | 5 ++---
 macro/tof/beamtime/apr14/currents/loopTreeConv.C            | 5 ++---
 macro/tof/beamtime/apr14/currents/mergeTrees.C              | 5 ++---
 macro/tof/beamtime/apr14/currents/ratePlot.C                | 4 +---
 macro/tof/beamtime/apr14/currents/ratePlotExample.C         | 4 +---
 macro/tof/beamtime/apr14/currents/ratePlotHd.C              | 4 +---
 macro/tof/beamtime/apr14/pl_all_DigiCor.C                   | 3 ---
 macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C              | 3 ---
 macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C                | 3 ---
 macro/tof/beamtime/apr14/pl_all_trb_evtsize.C               | 3 ---
 macro/tof/beamtime/apr14/pl_all_trbtdc.C                    | 3 ---
 macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C        | 3 ---
 macro/tof/beamtime/apr14/pl_all_trbtdc_words.C              | 3 ---
 macro/tof/beamtime/apr14/pl_deb_pla.C                       | 3 ---
 macro/tof/beamtime/apr14/pl_moni_clu.C                      | 3 ---
 macro/tof/beamtime/apr14/pl_over_Mat04best.C                | 3 ---
 macro/tof/beamtime/apr14/pl_over_Mat24.C                    | 3 ---
 macro/tof/beamtime/apr14/pl_over_cl2g.C                     | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu.C                      | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu0.C                     | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu0T0.C                   | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu1.C                     | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu2.C                     | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu2T.C                    | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu2trg0.C                 | 3 ---
 macro/tof/beamtime/apr14/pl_over_clu4.C                     | 3 ---
 macro/tof/beamtime/apr14/pl_over_cluTrg.C                   | 3 ---
 macro/tof/beamtime/apr14/pl_over_clust.C                    | 3 ---
 macro/tof/beamtime/apr14/pl_over_pla.C                      | 3 ---
 macro/tof/beamtime/apr14/pl_over_trb_ct.C                   | 3 ---
 macro/tof/beamtime/apr14/pl_over_trb_ft.C                   | 3 ---
 macro/tof/beamtime/apr14/pl_over_vftx.C                     | 3 ---
 macro/tof/beamtime/feb15/ana_digi.C                         | 3 ---
 macro/tof/beamtime/feb15/ana_digi_cal.C                     | 3 ---
 macro/tof/beamtime/feb15/ana_digi_deb.C                     | 3 ---
 macro/tof/beamtime/feb15/ana_digi_ini.C                     | 3 ---
 macro/tof/beamtime/feb15/ana_digi_nodia.C                   | 3 ---
 macro/tof/beamtime/feb15/ana_hits.C                         | 3 ---
 macro/tof/beamtime/feb15/basic_unpacking.C                  | 3 ---
 macro/tof/beamtime/feb15/current/FileListDef.h              | 4 +---
 macro/tof/beamtime/feb15/current/StructDef.h                | 5 ++---
 macro/tof/beamtime/feb15/current/currentTreeConv.C          | 3 ---
 macro/tof/beamtime/feb15/current/loopTreeConv.C             | 4 +---
 macro/tof/beamtime/feb15/current/mergeTrees.C               | 5 ++---
 macro/tof/beamtime/feb15/current/plot_Current_Date.C        | 4 +---
 macro/tof/beamtime/feb15/dis_hits.C                         | 3 ---
 macro/tof/beamtime/feb15/merge_rate.C                       | 5 ++---
 macro/tof/beamtime/feb15/pl_XY_trk.C                        | 3 ---
 macro/tof/beamtime/feb15/pl_all_CluMul.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_all_DigiCor.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_all_XY.C                        | 3 ---
 macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C              | 3 ---
 macro/tof/beamtime/feb15/pl_all_cluWalk.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_all_cluWalkSel.C                | 3 ---
 macro/tof/beamtime/feb15/pl_all_time_resolution.C           | 3 ---
 macro/tof/beamtime/feb15/pl_all_trb_evtsize.C               | 3 ---
 macro/tof/beamtime/feb15/pl_all_trbtdc.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C        | 3 ---
 macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C               | 3 ---
 macro/tof/beamtime/feb15/pl_all_trbtdc_words.C              | 3 ---
 macro/tof/beamtime/feb15/pl_calib_trk.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_deb_pla.C                       | 3 ---
 macro/tof/beamtime/feb15/pl_diam_tres.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_eff_XY.C                        | 3 ---
 macro/tof/beamtime/feb15/pl_info_2D.C                       | 3 ---
 macro/tof/beamtime/feb15/pl_info_Chi2D.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_info_Mat04D4best.C              | 3 ---
 macro/tof/beamtime/feb15/pl_info_cluTot.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_loc_XY.C                        | 3 ---
 macro/tof/beamtime/feb15/pl_map_debug.C                     | 4 +---
 macro/tof/beamtime/feb15/pl_moni_clu.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_over_2hit.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_Mat04.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_over_Mat04D4best.C              | 3 ---
 macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C             | 3 ---
 macro/tof/beamtime/feb15/pl_over_Mat04best.C                | 3 ---
 macro/tof/beamtime/feb15/pl_over_Mat24.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_over_MatD4sel.C                 | 3 ---
 macro/tof/beamtime/feb15/pl_over_XX.C                       | 3 ---
 macro/tof/beamtime/feb15/pl_over_cl2g.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu0.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu0T0.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu1.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu2.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu2T.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu2T0.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu2trg0.C                 | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu4.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu4T0.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu5.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu6.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu7.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu7T0.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_clu8.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_over_cluSel.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_clust.C                    | 3 ---
 macro/tof/beamtime/feb15/pl_over_cor.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_over_off.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_over_pla.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_over_trb_ct.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_trb_ft.C                   | 3 ---
 macro/tof/beamtime/feb15/pl_over_trk.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_over_vftx.C                     | 3 ---
 macro/tof/beamtime/feb15/pl_page.C                          | 3 ---
 macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C                | 3 ---
 macro/tof/beamtime/feb15/pl_pla_resolution.C                | 3 ---
 macro/tof/beamtime/feb15/pl_pull_trk.C                      | 3 ---
 macro/tof/beamtime/feb15/pl_tdc_ref_res.C                   | 4 +---
 macro/tof/beamtime/feb15/pl_time_resolution.C               | 4 +---
 macro/tof/beamtime/feb15/pl_tot_per_channel.C               | 3 ---
 macro/tof/beamtime/feb15/pl_vert_trk.C                      | 3 ---
 macro/tof/beamtime/feb15/plot_Flux.C                        | 3 ---
 macro/tof/beamtime/feb15/plot_Flux_Date.C                   | 3 ---
 macro/tof/beamtime/feb15/rates_unpacking.C                  | 3 ---
 macro/tof/beamtime/feb15/rootlogon.C                        | 3 ---
 macro/tof/beamtime/feb15/unpackCalib.C                      | 3 ---
 macro/tof/beamtime/feb15/unpackRun.C                        | 3 ---
 macro/tof/beamtime/fit_ybox.C                               | 3 ---
 macro/tof/beamtime/get4/set_Get4v1Cond.C                    | 3 ---
 macro/tof/beamtime/get4/set_Get4v1Par.C                     | 3 ---
 macro/tof/beamtime/get4/unpack_get4_Fair.C                  | 3 ---
 macro/tof/beamtime/invert_matrix.C                          | 3 ---
 macro/tof/beamtime/lab16/ana_digi.C                         | 3 ---
 macro/tof/beamtime/lab16/ana_digi_cal.C                     | 3 ---
 macro/tof/beamtime/lab16/ana_digi_cal_self.C                | 3 ---
 macro/tof/beamtime/lab16/ana_digi_ini.C                     | 3 ---
 macro/tof/beamtime/lab16/ana_digi_nh.C                      | 3 ---
 macro/tof/beamtime/lab16/ana_hits.C                         | 3 ---
 macro/tof/beamtime/lab16/ana_hits_nh.C                      | 3 ---
 macro/tof/beamtime/lab16/basic_unpacking.C                  | 3 ---
 macro/tof/beamtime/lab16/dis_digi.C                         | 3 ---
 macro/tof/beamtime/lab16/dis_hits.C                         | 3 ---
 macro/tof/beamtime/lab16/hld_unpack.C                       | 3 ---
 macro/tof/beamtime/lab16/merge_rate.C                       | 5 ++---
 macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C        | 5 ++---
 macro/tof/beamtime/lab16/pl_all_time_resolution.C           | 3 ---
 macro/tof/beamtime/lab16/pl_all_trb_evtsize.C               | 3 ---
 macro/tof/beamtime/lab16/pl_all_trbtdc.C                    | 3 ---
 macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C        | 3 ---
 macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C               | 3 ---
 macro/tof/beamtime/lab16/pl_all_trbtdc_words.C              | 3 ---
 macro/tof/beamtime/lab16/pl_over_trb_ct.C                   | 3 ---
 macro/tof/beamtime/lab16/pl_over_trb_ft.C                   | 3 ---
 macro/tof/beamtime/lab16/plot_Flux.C                        | 3 ---
 macro/tof/beamtime/lab16/plot_Flux_Date.C                   | 3 ---
 macro/tof/beamtime/lab16/rates_monitoring.C                 | 3 ---
 macro/tof/beamtime/lab16/rates_unpacking.C                  | 3 ---
 macro/tof/beamtime/lab16/rootlogon.C                        | 3 ---
 macro/tof/beamtime/lab16/tdcref_monitoring.C                | 3 ---
 macro/tof/beamtime/lab16/tdcref_monitoring_auto.C           | 3 ---
 macro/tof/beamtime/lab16/unpackCalib.C                      | 3 ---
 macro/tof/beamtime/lab16/unpackRun.C                        | 3 ---
 macro/tof/beamtime/load_hst.C                               | 3 ---
 macro/tof/beamtime/nov15/ana_calib_hits.C                   | 3 ---
 macro/tof/beamtime/nov15/ana_digi.C                         | 3 ---
 macro/tof/beamtime/nov15/ana_digi_cal.C                     | 3 ---
 macro/tof/beamtime/nov15/ana_digi_ini.C                     | 3 ---
 macro/tof/beamtime/nov15/ana_hits.C                         | 3 ---
 macro/tof/beamtime/nov15/ana_trks.C                         | 3 ---
 macro/tof/beamtime/nov15/basic_unpacking.C                  | 3 ---
 macro/tof/beamtime/nov15/calib_digi.C                       | 3 ---
 macro/tof/beamtime/nov15/calib_digi_cal.C                   | 3 ---
 macro/tof/beamtime/nov15/calib_digi_ini.C                   | 3 ---
 macro/tof/beamtime/nov15/current/FileListDef.h              | 4 +---
 macro/tof/beamtime/nov15/current/StructDef.h                | 5 ++---
 macro/tof/beamtime/nov15/current/currentTreeConv.C          | 3 ---
 macro/tof/beamtime/nov15/current/loopTreeConv.C             | 4 +---
 macro/tof/beamtime/nov15/current/mergeTrees.C               | 5 ++---
 macro/tof/beamtime/nov15/current/plot_Current_Date.C        | 4 +---
 macro/tof/beamtime/nov15/dis_digi.C                         | 3 ---
 macro/tof/beamtime/nov15/dis_hits.C                         | 3 ---
 macro/tof/beamtime/nov15/hld_unpack.C                       | 3 ---
 macro/tof/beamtime/nov15/merge_rate.C                       | 5 ++---
 macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C        | 5 ++---
 macro/tof/beamtime/nov15/pl_all_time_resolution.C           | 3 ---
 macro/tof/beamtime/nov15/pl_all_trb_evtsize.C               | 3 ---
 macro/tof/beamtime/nov15/pl_all_trbtdc.C                    | 3 ---
 macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C        | 3 ---
 macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C               | 3 ---
 macro/tof/beamtime/nov15/pl_all_trbtdc_words.C              | 3 ---
 macro/tof/beamtime/nov15/pl_over_trb_ct.C                   | 3 ---
 macro/tof/beamtime/nov15/pl_over_trb_ft.C                   | 3 ---
 macro/tof/beamtime/nov15/plot_Flux.C                        | 3 ---
 macro/tof/beamtime/nov15/plot_Flux_Date.C                   | 3 ---
 macro/tof/beamtime/nov15/rates_monitoring.C                 | 3 ---
 macro/tof/beamtime/nov15/rates_unpacking.C                  | 3 ---
 macro/tof/beamtime/nov15/rootlogon.C                        | 3 ---
 macro/tof/beamtime/nov15/tdcref_monitoring.C                | 3 ---
 macro/tof/beamtime/nov15/tdcref_monitoring_auto.C           | 3 ---
 macro/tof/beamtime/nov15/unpackCalib.C                      | 3 ---
 macro/tof/beamtime/nov15/unpackRun.C                        | 3 ---
 macro/tof/beamtime/pl_Ana_Dut.C                             | 3 ---
 macro/tof/beamtime/pl_DigiCor.C                             | 3 ---
 macro/tof/beamtime/pl_MulCor.C                              | 3 ---
 macro/tof/beamtime/pl_TIS.C                                 | 3 ---
 macro/tof/beamtime/pl_XY_trk.C                              | 3 ---
 macro/tof/beamtime/pl_all_CluMul.C                          | 3 ---
 macro/tof/beamtime/pl_all_DigiCor.C                         | 3 ---
 macro/tof/beamtime/pl_all_XY.C                              | 3 ---
 macro/tof/beamtime/pl_all_cluDelTofSel.C                    | 3 ---
 macro/tof/beamtime/pl_all_cluWalk.C                         | 3 ---
 macro/tof/beamtime/pl_all_cluWalkSel.C                      | 3 ---
 macro/tof/beamtime/pl_all_dTSel.C                           | 3 ---
 macro/tof/beamtime/pl_all_time_resolution.C                 | 3 ---
 macro/tof/beamtime/pl_all_trb_evtsize.C                     | 3 ---
 macro/tof/beamtime/pl_all_trbtdc.C                          | 3 ---
 macro/tof/beamtime/pl_all_trbtdc_proc_status.C              | 3 ---
 macro/tof/beamtime/pl_all_trbtdc_refs.C                     | 3 ---
 macro/tof/beamtime/pl_all_trbtdc_tot.C                      | 3 ---
 macro/tof/beamtime/pl_all_trbtdc_words.C                    | 3 ---
 macro/tof/beamtime/pl_ana_DTXY.C                            | 3 ---
 macro/tof/beamtime/pl_calib_trk.C                           | 3 ---
 macro/tof/beamtime/pl_deb_pla.C                             | 3 ---
 macro/tof/beamtime/pl_diam_tres.C                           | 3 ---
 macro/tof/beamtime/pl_eff_XY.C                              | 3 ---
 macro/tof/beamtime/pl_info_2D.C                             | 3 ---
 macro/tof/beamtime/pl_info_Chi2D.C                          | 3 ---
 macro/tof/beamtime/pl_info_Mat04D4best.C                    | 3 ---
 macro/tof/beamtime/pl_info_cluTot.C                         | 3 ---
 macro/tof/beamtime/pl_loc_XY.C                              | 3 ---
 macro/tof/beamtime/pl_map_debug.C                           | 4 +---
 macro/tof/beamtime/pl_moni_clu.C                            | 3 ---
 macro/tof/beamtime/pl_over_2hit.C                           | 3 ---
 macro/tof/beamtime/pl_over_Mat04.C                          | 3 ---
 macro/tof/beamtime/pl_over_Mat04D4best.C                    | 3 ---
 macro/tof/beamtime/pl_over_Mat04D4sbest.C                   | 3 ---
 macro/tof/beamtime/pl_over_Mat04best.C                      | 3 ---
 macro/tof/beamtime/pl_over_Mat24.C                          | 3 ---
 macro/tof/beamtime/pl_over_MatD4sel.C                       | 3 ---
 macro/tof/beamtime/pl_over_XX.C                             | 3 ---
 macro/tof/beamtime/pl_over_cl2g.C                           | 3 ---
 macro/tof/beamtime/pl_over_clu.C                            | 3 ---
 macro/tof/beamtime/pl_over_clu0.C                           | 3 ---
 macro/tof/beamtime/pl_over_clu0T0.C                         | 3 ---
 macro/tof/beamtime/pl_over_clu2T.C                          | 3 ---
 macro/tof/beamtime/pl_over_clu2T0.C                         | 3 ---
 macro/tof/beamtime/pl_over_clu2trg0.C                       | 3 ---
 macro/tof/beamtime/pl_over_clu4T0.C                         | 3 ---
 macro/tof/beamtime/pl_over_cluSel.C                         | 3 ---
 macro/tof/beamtime/pl_over_clust.C                          | 3 ---
 macro/tof/beamtime/pl_over_cor.C                            | 3 ---
 macro/tof/beamtime/pl_over_off.C                            | 3 ---
 macro/tof/beamtime/pl_over_pla.C                            | 3 ---
 macro/tof/beamtime/pl_over_trb_ct.C                         | 3 ---
 macro/tof/beamtime/pl_over_trb_ft.C                         | 3 ---
 macro/tof/beamtime/pl_over_trk.C                            | 3 ---
 macro/tof/beamtime/pl_over_vftx.C                           | 3 ---
 macro/tof/beamtime/pl_page.C                                | 3 ---
 macro/tof/beamtime/pl_pla_res_vs_tot.C                      | 3 ---
 macro/tof/beamtime/pl_pla_resolution.C                      | 3 ---
 macro/tof/beamtime/pl_pull_trk.C                            | 3 ---
 macro/tof/beamtime/pl_tdc_ref_res.C                         | 4 +---
 macro/tof/beamtime/pl_time_resolution.C                     | 4 +---
 macro/tof/beamtime/pl_tot_per_channel.C                     | 3 ---
 macro/tof/beamtime/pl_trigger.C                             | 3 ---
 macro/tof/beamtime/pl_vert_trk.C                            | 3 ---
 macro/tof/beamtime/save_hst.C                               | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C              | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C             | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C            | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C            | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C             | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C            | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C              | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C             | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C            | 3 ---
 macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C             | 3 ---
 macro/tof/beamtime/sep14/ana_digi.C                         | 3 ---
 macro/tof/beamtime/sep14/ana_digi3.C                        | 3 ---
 macro/tof/beamtime/sep14/ana_digi_cal.C                     | 3 ---
 macro/tof/beamtime/sep14/ana_hits.C                         | 3 ---
 macro/tof/beamtime/sep14/pl_all_CluMul.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_all_DigiCor.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_all_XY.C                        | 3 ---
 macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C              | 3 ---
 macro/tof/beamtime/sep14/pl_all_cluWalk.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_all_cluWalkSel.C                | 3 ---
 macro/tof/beamtime/sep14/pl_all_dTSel.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_all_time_resolution.C           | 3 ---
 macro/tof/beamtime/sep14/pl_all_trb_evtsize.C               | 3 ---
 macro/tof/beamtime/sep14/pl_all_trbtdc.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C        | 3 ---
 macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C               | 3 ---
 macro/tof/beamtime/sep14/pl_all_trbtdc_words.C              | 3 ---
 macro/tof/beamtime/sep14/pl_diam_tres.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_info_2D.C                       | 3 ---
 macro/tof/beamtime/sep14/pl_info_Chi2D.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_info_Mat04D4best.C              | 3 ---
 macro/tof/beamtime/sep14/pl_map_debug.C                     | 4 +---
 macro/tof/beamtime/sep14/pl_over_Mat04.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_over_Mat04D4best.C              | 3 ---
 macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C             | 3 ---
 macro/tof/beamtime/sep14/pl_over_Mat04best.C                | 3 ---
 macro/tof/beamtime/sep14/pl_over_Mat24.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_over_MatD4sel.C                 | 3 ---
 macro/tof/beamtime/sep14/pl_over_XX.C                       | 3 ---
 macro/tof/beamtime/sep14/pl_over_cl2g.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu.C                      | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu0.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu0T0.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu1.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu2.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu2T.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu2T0.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu2trg0.C                 | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu4.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu4T0.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu5.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu6.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu7.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu7T0.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_clu8.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_over_cluSel.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_clust.C                    | 3 ---
 macro/tof/beamtime/sep14/pl_over_cor.C                      | 3 ---
 macro/tof/beamtime/sep14/pl_over_pla.C                      | 3 ---
 macro/tof/beamtime/sep14/pl_over_trb_ct.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_trb_ft.C                   | 3 ---
 macro/tof/beamtime/sep14/pl_over_vftx.C                     | 3 ---
 macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C                | 3 ---
 macro/tof/beamtime/sep14/pl_pla_resolution.C                | 3 ---
 macro/tof/beamtime/sep14/pl_tdc_ref_res.C                   | 4 +---
 macro/tof/beamtime/sep14/pl_time_resolution.C               | 4 +---
 macro/tof/beamtime/sep14/pl_tot_per_channel.C               | 3 ---
 macro/tof/beamtime/thuqa/basic_unpacking.C                  | 3 ---
 macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C        | 5 ++---
 macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C | 5 ++---
 macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C               | 5 ++---
 macro/tof/beamtime/thuqa/pl_all_time_resolution.C           | 3 ---
 macro/tof/beamtime/unpack_run36_Fair.C                      | 3 ---
 macro/tof/deb/global_phys.C                                 | 3 ---
 macro/tof/deb/tof_Ana100p.C                                 | 4 +---
 macro/tof/deb/tof_Ana104.C                                  | 4 +---
 macro/tof/deb/tof_Ana300.C                                  | 4 +---
 macro/tof/deb/tof_Ana_100.C                                 | 4 +---
 macro/tof/deb/tof_ana100.C                                  | 4 +---
 macro/tof/deb/tof_deb100.C                                  | 4 +---
 macro/tof/deb/tof_reco100.C                                 | 3 ---
 macro/tof/deb/tof_reco100box.C                              | 3 ---
 macro/tof/deb/tof_reco100p.C                                | 3 ---
 macro/tof/deb/tof_reco104.C                                 | 3 ---
 macro/tof/deb/tof_reco300.C                                 | 3 ---
 macro/tof/deb/tof_sim100box.C                               | 3 ---
 macro/tof/deb/tof_sim100p.C                                 | 3 ---
 macro/tof/deb/tof_sim104.C                                  | 3 ---
 macro/tof/digitizer/GenTofBdfRootInput_v17a.C               | 3 ---
 macro/tof/digitizer/run_digi.C                              | 3 ---
 macro/tof/digitizer/run_digi_test.C                         | 3 ---
 macro/tof/digitizer/run_reco.C                              | 3 ---
 macro/tof/digitizer/run_reco100.C                           | 3 ---
 macro/tof/digitizer/run_tof_disim.C                         | 3 ---
 macro/tof/eventDisplay100.C                                 | 4 +---
 macro/tof/eventDisplay_1p.C                                 | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v12a.C               | 4 +---
 macro/tof/geometry/Create_TOF_Geometry_v13_3a.C             | 4 +---
 macro/tof/geometry/Create_TOF_Geometry_v13_3b.C             | 4 +---
 macro/tof/geometry/Create_TOF_Geometry_v13_4x.C             | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v13_5x.C             | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v14_0.C              | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v14a.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v14b.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v14c.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v15a.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v15b.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v15c.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v15d.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v16a.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v16b.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v16c.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v16d.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v16e.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v17a.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v17b.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v17c.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C      | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C          | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C          | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v18p.C               | 3 ---
 macro/tof/geometry/Create_TOF_Geometry_v20a.C               | 3 ---
 macro/tof/geometry/TOF_test.C                               | 3 ---
 macro/tof/geometry/make_geofile.C                           | 3 ---
 macro/tof/geometry/make_geofile_noBfield.C                  | 3 ---
 macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C        | 3 ---
 macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C        | 3 ---
 .../geometry/star/Create_TOF_Geometry_v18_star_cosmics_a.C  | 3 ---
 macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C      | 3 ---
 macro/tof/pl_lambda.C                                       | 3 ---
 macro/tof/qa/GeomHitMapComp.C                               | 5 ++---
 macro/tof/qa/data/MultiPntDeltaYClosest.C                   | 3 ---
 macro/tof/qa/data/MultiPntDeltaYMean.C                      | 3 ---
 macro/tof/qa/data/MultiTrkDeltaYClosest.C                   | 3 ---
 macro/tof/qa/data/MultiTrkDeltaYMean.C                      | 3 ---
 macro/tof/qa/data/SingTrkDeltaY.C                           | 3 ---
 macro/tof/qa/data/SingTrkMultiPntDeltaY.C                   | 3 ---
 macro/tof/qa/hitProdComp.C                                  | 3 ---
 macro/tof/qa/hitProdCompPull.C                              | 3 ---
 macro/tof/qa/hitProdDigiComp.C                              | 3 ---
 macro/tof/qa/hitQualComp.C                                  | 4 +---
 macro/tof/qa/hitQualCompBest.C                              | 4 +---
 macro/tof/qa/hitQualCompPull.C                              | 4 +---
 macro/tof/qa/qaPlotsComp.C                                  | 3 ---
 macro/tof/qa/tof_hitMeanMc_eff.C                            | 4 +---
 macro/tof/qa/tof_map_norm_gen_ana.C                         | 3 ---
 macro/tof/qa/tof_map_norm_gen_mc.C                          | 3 ---
 macro/tof/qa/tof_qa_ana.C                                   | 3 ---
 macro/tof/qa/tof_qa_hp.C                                    | 3 ---
 macro/tof/qa/tof_qa_plot.C                                  | 4 +---
 macro/tof/qa/tof_qa_sim.C                                   | 3 ---
 macro/tof/qa/trd_notrd_comp.C                               | 4 +---
 macro/tof/qa/valGeomComp.C                                  | 4 +---
 macro/tof/qa/valHpDigiComp.C                                | 4 +---
 macro/tof/run100.C                                          | 3 ---
 macro/tof/run_reco100.C                                     | 3 ---
 macro/tof/run_reco_TOF_QA.C                                 | 3 ---
 macro/tof/run_sim_TOF_QA.C                                  | 3 ---
 macro/tof/tof_ana_Testbeam.C                                | 3 ---
 macro/tof/tof_reco.C                                        | 3 ---
 macro/tof/tof_reco100.C                                     | 3 ---
 macro/tof/tof_reco_Testbeam.C                               | 3 ---
 macro/tof/tof_sim.C                                         | 3 ---
 macro/tof/tof_sim100.C                                      | 3 ---
 macro/tof/tof_sim_Testbeam.C                                | 3 ---
 macro/tools/skimming_reco.C                                 | 3 ---
 macro/tracking/lx/gen_mu_pairs.C                            | 3 ---
 macro/tracking/lx/run_mc.C                                  | 3 ---
 macro/tracking/lx/run_reco.C                                | 3 ---
 macro/tracking/lx/run_stat.C                                | 3 ---
 macro/trd/CbmTrdHitsProd.C                                  | 3 ---
 macro/trd/TimeBasedSim/run_trd_reco.C                       | 3 ---
 macro/trd/TimeBasedSim/run_trd_sim.C                        | 3 ---
 macro/trd/beamtime/hv/analyzeHV.C                           | 3 ---
 macro/trd/beamtime/hv/monHV.C                               | 3 ---
 macro/trd/beamtime/hv/monHVlong.C                           | 3 ---
 macro/trd/beamtime/hv/readHV.C                              | 3 ---
 macro/trd/create_geometry_file_root.C                       | 3 ---
 macro/trd/create_geometry_file_root_test.C                  | 3 ---
 macro/trd/data/plotResults.C                                | 3 ---
 macro/trd/data/readResults.C                                | 3 ---
 macro/trd/elid/trd_elid_reco.C                              | 3 ---
 macro/trd/elid/trd_elid_sim.C                               | 3 ---
 macro/trd/eventDisplay.C                                    | 4 +---
 macro/trd/geometry/plot_hollow_modules.C                    | 3 ---
 macro/trd/geometry/plot_pad_size_in_layer.C                 | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15a_3e.C    | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15b_3e.C    | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15c_3e.C    | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1e.C    | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1m.C    | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1e.C    | 3 ---
 macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1m.C    | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C       | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a_3e.C    | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C       | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C       | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C       | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C       | 3 ---
 macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C       | 3 ---
 macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C       | 3 ---
 macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C       | 3 ---
 macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C       | 3 ---
 macro/trd/hitrateDisplay.C                                  | 3 ---
 macro/trd/mcbm_mc.C                                         | 3 ---
 macro/trd/mcbm_reco.C                                       | 3 ---
 macro/trd/pidTraining/run_pid_sim.C                         | 3 ---
 macro/trd/run_CbmMCEventHeader.C                            | 3 ---
 macro/trd/run_reco.C                                        | 3 ---
 macro/trd/run_reco_TB.C                                     | 3 ---
 macro/trd/run_reco_clusterizer.C                            | 3 ---
 macro/trd/run_reco_clusterizerFast.C                        | 3 ---
 macro/trd/run_reco_digitizer.C                              | 3 ---
 macro/trd/run_reco_dpb.C                                    | 3 ---
 macro/trd/run_reco_hitdensitytest.C                         | 3 ---
 macro/trd/run_reco_hitratetest.C                            | 3 ---
 macro/trd/run_reco_maf.C                                    | 3 ---
 macro/trd/run_reco_occupancy.C                              | 3 ---
 macro/trd/run_reco_photon.C                                 | 3 ---
 macro/trd/run_reco_pi0.C                                    | 3 ---
 macro/trd/run_reco_plot.C                                   | 3 ---
 macro/trd/run_reco_qa.C                                     | 3 ---
 macro/trd/run_reco_ratioplot.C                              | 3 ---
 macro/trd/run_reco_smearing.C                               | 3 ---
 macro/trd/run_sim100.C                                      | 3 ---
 macro/trd/run_sim_maf.C                                     | 3 ---
 macro/trd/run_sim_pi0.C                                     | 3 ---
 macro/trd/run_sim_qa.C                                      | 3 ---
 macro/trd/run_sim_single_elec.C                             | 3 ---
 macro/trd/sim.C                                             | 4 +---
 macro/trd/trd_digi1.C                                       | 3 ---
 macro/trd/trd_digi2.C                                       | 3 ---
 macro/trd/trd_sim.C                                         | 3 ---
 macro/trd/trd_sim_benchmark.C                               | 3 ---
 macro/tutorial/run_HitProducerTaskIdeal.C                   | 3 ---
 mvd/CbmMvdClusterfinder.cxx                                 | 3 ---
 mvd/CbmMvdClusterfinderTB.cxx                               | 3 ---
 mvd/CbmMvdDigiToHit.cxx                                     | 3 ---
 mvd/CbmMvdDigiToHitTB.cxx                                   | 3 ---
 mvd/CbmMvdDigitizer.cxx                                     | 3 ---
 mvd/CbmMvdDigitizerTB.cxx                                   | 3 ---
 mvd/CbmMvdHitfinder.cxx                                     | 3 ---
 mvd/CbmMvdHitfinderTB.cxx                                   | 3 ---
 mvd/CbmMvdLinkDef.h                                         | 4 +---
 mvd/CbmMvdReadout.cxx                                       | 3 ---
 mvd/SensorDataSheets/CbmMvdMimosis.cxx                      | 3 ---
 mvd/SensorDataSheets/CbmMvdMimosis.h                        | 3 ---
 mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx             | 3 ---
 mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h               | 3 ---
 mvd/tools/CbmMvdHelper.h                                    | 4 +---
 reco/KF/CbmKF.cxx                                           | 4 +---
 reco/KF/CbmKFFieldMath.cxx                                  | 4 +---
 reco/KF/CbmKFHit.cxx                                        | 5 ++---
 reco/KF/CbmKFMaterial.cxx                                   | 4 +---
 reco/KF/CbmKFMath.cxx                                       | 4 +---
 reco/KF/CbmKFParticleFinder.cxx                             | 4 +---
 reco/KF/CbmKFParticleFinder.h                               | 4 +---
 reco/KF/CbmKFParticleFinderPID.cxx                          | 4 +---
 reco/KF/CbmKFParticleFinderPID.h                            | 4 +---
 reco/KF/CbmKFParticleFinderQA.cxx                           | 4 +---
 reco/KF/CbmKFParticleFinderQA.h                             | 4 +---
 reco/KF/CbmKFParticleInterface.cxx                          | 4 +---
 reco/KF/CbmKFParticleInterface.h                            | 4 +---
 reco/KF/CbmKFPixelMeasurement.cxx                           | 4 +---
 reco/KF/CbmKFUMeasurement.cxx                               | 4 +---
 reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx           | 5 ++---
 reco/KF/Interface/CbmKFStsHit.cxx                           | 5 ++---
 reco/KF/Interface/CbmKFStsHit.h                             | 4 +---
 reco/KF/Interface/CbmKFTrack.cxx                            | 4 +---
 reco/KF/Interface/CbmKFVertex.cxx                           | 5 ++---
 reco/KF/Interface/CbmKFVertex.h                             | 4 +---
 reco/KF/Interface/CbmPVFinderKF.cxx                         | 4 +---
 reco/KF/Interface/CbmStsKFTrackFitter.cxx                   | 4 +---
 reco/KF/Interface/CbmStsKFTrackFitter.h                     | 4 +---
 reco/KF/KFLinkDef.h                                         | 4 +---
 reco/KF/KFQA/CbmKFPartEfficiencies.h                        | 4 +---
 reco/KF/KFQA/CbmKFTrackQA.cxx                               | 4 +---
 reco/KF/KFQA/CbmKFTrackQA.h                                 | 4 +---
 reco/L1/CbmL1Constants.h                                    | 4 +---
 reco/L1/CbmL1Counters.h                                     | 4 +---
 reco/L1/CbmL1Def.h                                          | 4 +---
 reco/L1/CbmL1StsHit.h                                       | 4 +---
 reco/L1/CbmL1TrackPar.h                                     | 4 +---
 reco/L1/CbmL1TrdTracklet.cxx                                | 4 +---
 reco/L1/CbmL1TrdTracklet.h                                  | 4 +---
 reco/L1/CbmL1TrdTracklet4.cxx                               | 4 +---
 reco/L1/CbmL1TrdTracklet4.h                                 | 4 +---
 reco/L1/L1Algo/L1Algo.cxx                                   | 4 +---
 reco/L1/L1Algo/L1Algo.h                                     | 4 +---
 reco/L1/L1Algo/L1AlgoTBB.h                                  | 4 +---
 reco/L1/L1Algo/L1Event.cxx                                  | 4 +---
 reco/L1/L1Algo/L1Event.h                                    | 4 +---
 reco/L1/L1Algo/L1EventEfficiencies.h                        | 4 +---
 reco/L1/L1Algo/L1EventMatch.cxx                             | 4 +---
 reco/L1/L1Algo/L1EventMatch.h                               | 4 +---
 reco/L1/L1Algo/L1Extrapolation.h                            | 4 +---
 reco/L1/L1Algo/L1Field.h                                    | 4 +---
 reco/L1/L1Algo/L1Filtration.h                               | 4 +---
 reco/L1/L1Algo/L1FitMaterial.h                              | 4 +---
 reco/L1/L1Algo/L1Grid.cxx                                   | 4 +---
 reco/L1/L1Algo/L1HitArea.h                                  | 4 +---
 reco/L1/L1Algo/L1HitPoint.h                                 | 4 +---
 reco/L1/L1Algo/L1HitsSortHelper.cxx                         | 5 ++---
 reco/L1/L1Algo/L1HitsSortHelper.h                           | 4 +---
 reco/L1/L1Algo/L1MCEvent.cxx                                | 4 +---
 reco/L1/L1Algo/L1MCEvent.h                                  | 4 +---
 reco/L1/L1Algo/L1MaterialInfo.h                             | 4 +---
 reco/L1/L1Algo/L1Portion.h                                  | 4 +---
 reco/L1/L1Algo/L1Station.h                                  | 4 +---
 reco/L1/L1Algo/L1StsHit.h                                   | 4 +---
 reco/L1/L1Algo/L1TrackExtender.cxx                          | 4 +---
 reco/L1/L1Algo/L1TrackPar.h                                 | 4 +---
 reco/L1/L1Algo/L1TrackParFit.cxx                            | 4 +---
 reco/L1/L1Algo/L1TrackParFit.h                              | 4 +---
 reco/L1/L1Algo/L1Triplet.h                                  | 3 ---
 reco/L1/L1Algo/L1UMeasurementInfo.h                         | 4 +---
 reco/L1/L1Algo/L1XYMeasurementInfo.h                        | 4 +---
 reco/L1/L1Algo/utils/L1AlgoDraw.h                           | 4 +---
 reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h          | 4 +---
 reco/L1/L1Algo/utils/L1AlgoPulls.h                          | 4 +---
 reco/L1/L1Algo/utils/L1CADebug.h                            | 4 +---
 reco/L1/L1AlgoInputData.cxx                                 | 4 +---
 reco/L1/L1AlgoInputData.h                                   | 4 +---
 reco/L1/L1LinkDef.h                                         | 4 +---
 reco/L1/OffLineInterface/CbmL1MuchFinder.cxx                | 4 +---
 reco/L1/OffLineInterface/CbmL1MuchFinder.h                  | 4 +---
 reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx              | 4 +---
 reco/L1/OffLineInterface/CbmL1MuchFinderQa.h                | 4 +---
 reco/L1/OffLineInterface/CbmL1MuchHit.cxx                   | 5 ++---
 reco/L1/OffLineInterface/CbmL1MuchHit.h                     | 4 +---
 reco/L1/OffLineInterface/CbmL1MuchTrack.cxx                 | 5 ++---
 reco/L1/OffLineInterface/CbmL1MuchTrack.h                   | 4 +---
 reco/L1/OffLineInterface/CbmL1RichRingQa.cxx                | 4 +---
 reco/L1/OffLineInterface/CbmL1RichRingQa.h                  | 4 +---
 reco/L1/OffLineInterface/CbmL1SttHit.cxx                    | 5 ++---
 reco/L1/OffLineInterface/CbmL1SttHit.h                      | 4 +---
 reco/L1/OffLineInterface/CbmL1SttTrack.cxx                  | 5 ++---
 reco/L1/OffLineInterface/CbmL1SttTrack.h                    | 4 +---
 reco/L1/OffLineInterface/CbmL1SttTrackFinder.h              | 4 +---
 reco/L1/PerformanceConstants.h                              | 4 +---
 reco/L1/utils/Draw_L1_histo.C                               | 4 +---
 reco/L1/vectors/P4_F32vec4.h                                | 4 +---
 reco/L1/vectors/P4_F64vec2.h                                | 4 +---
 reco/L1/vectors/PSEUDO_F32vec1.h                            | 4 +---
 reco/L1/vectors/PSEUDO_F32vec4.h                            | 4 +---
 reco/L1/vectors/PSEUDO_F64vec1.h                            | 4 +---
 reco/L1/vectors/std_alloc.h                                 | 3 ---
 reco/L1/vectors/vec_arithmetic.h                            | 4 +---
 reco/base/CbmRecoBaseLinkDef.h                              | 4 +---
 reco/calibration/CbmRecoCalLinkDef.h                        | 4 +---
 reco/detectors/much/CbmMuchMatchTracks.cxx                  | 4 +---
 reco/detectors/much/CbmMuchRecoLinkDef.h                    | 4 +---
 reco/detectors/psd/CbmPsdMCbmHitProducer.cxx                | 4 +---
 reco/detectors/psd/CbmPsdMCbmHitProducer.h                  | 4 +---
 reco/detectors/psd/CbmPsdRecoLinkDef.h                      | 4 +---
 reco/detectors/rich/CbmRichConverter.cxx                    | 4 +---
 reco/detectors/rich/CbmRichRecoLinkDef.h                    | 4 +---
 reco/detectors/rich/alignment/CbmRichAlignment.cxx          | 4 +---
 reco/detectors/rich/alignment/CbmRichAlignment.h            | 4 +---
 reco/detectors/rich/alignment/CbmRichCorrection.cxx         | 4 +---
 reco/detectors/rich/alignment/CbmRichCorrection.h           | 4 +---
 reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx   | 4 +---
 reco/detectors/rich/alignment/CbmRichCorrectionVector.h     | 4 +---
 reco/detectors/rich/alignment/CbmRichMirror.cxx             | 4 +---
 reco/detectors/rich/alignment/CbmRichMirror.h               | 4 +---
 .../rich/alignment/CbmRichMirrorSortingAlignment.cxx        | 4 +---
 .../rich/alignment/CbmRichMirrorSortingAlignment.h          | 4 +---
 .../rich/alignment/CbmRichMirrorSortingCorrection.cxx       | 4 +---
 .../rich/alignment/CbmRichMirrorSortingCorrection.h         | 4 +---
 reco/detectors/rich/alignment/CbmRichNavigationUtil2.h      | 4 +---
 reco/detectors/rich/alignment/CbmRichPMTMapping.cxx         | 4 +---
 reco/detectors/rich/alignment/CbmRichPMTMapping.h           | 4 +---
 .../detectors/rich/alignment/CbmRichProjectionProducer2.cxx | 4 +---
 reco/detectors/rich/alignment/CbmRichProjectionProducer2.h  | 4 +---
 reco/detectors/rich/alignment/CbmRichRecoQa.cxx             | 5 ++---
 reco/detectors/rich/alignment/CbmRichRecoQa.h               | 4 +---
 reco/detectors/rich/alignment/CbmRichUtil.h                 | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx          | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h            | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx         | 5 ++---
 reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h           | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx                  | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmQa.h                    | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx              | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h                | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx          | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h            | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx           | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h             | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx          | 4 +---
 reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h            | 4 +---
 reco/detectors/rich/qa/CbmRichRecoQa.cxx                    | 5 ++---
 reco/detectors/rich/qa/CbmRichRecoQa.h                      | 4 +---
 reco/detectors/rich/qa/CbmRichRecoTbQa.cxx                  | 4 +---
 reco/detectors/rich/qa/CbmRichRecoTbQa.h                    | 4 +---
 reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h      | 4 +---
 reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx         | 4 +---
 reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h           | 4 +---
 reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx      | 4 +---
 reco/detectors/rich/utils/CbmRichNavigationUtil.h           | 4 +---
 reco/detectors/rich/utils/CbmRichUtil.h                     | 4 +---
 reco/detectors/rich/utils/hadd.C                            | 3 ---
 reco/detectors/sts/CbmRecoStsLinkDef.h                      | 4 +---
 reco/detectors/tof/CbmTofRecoLinkDef.h                      | 4 +---
 reco/detectors/tof/CbmTofTBClusterizer.cxx                  | 3 ---
 reco/detectors/tof/CbmTofTrackFinderNN.cxx                  | 3 ---
 reco/detectors/tof/CbmTofTrackFinderNN.h                    | 3 ---
 reco/detectors/tof/LKFMinuit.cxx                            | 4 +---
 reco/detectors/tof/LKFMinuit.h                              | 4 +---
 reco/detectors/trd/CbmTrdClusterFinder.cxx                  | 4 +---
 reco/detectors/trd/CbmTrdHitProducer.cxx                    | 4 +---
 reco/detectors/trd/CbmTrdModuleRec.cxx                      | 4 +---
 reco/detectors/trd/CbmTrdModuleRec.h                        | 4 +---
 reco/detectors/trd/CbmTrdModuleRecR.cxx                     | 4 +---
 reco/detectors/trd/CbmTrdModuleRecR.h                       | 4 +---
 reco/detectors/trd/CbmTrdModuleRecT.cxx                     | 4 +---
 reco/detectors/trd/CbmTrdModuleRecT.h                       | 4 +---
 reco/detectors/trd/CbmTrdRecoLinkDef.h                      | 4 +---
 reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx          | 5 ++---
 reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx         | 3 ---
 reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h             | 4 +---
 reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx                | 4 +---
 reco/detectors/trd/qa/CbmTrdHitDensityQa.h                  | 4 +---
 reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h          | 4 +---
 reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx                 | 4 +---
 reco/detectors/trd/qa/CbmTrdOccupancyQa.h                   | 4 +---
 reco/detectors/trd/qa/CbmTrdQa.cxx                          | 4 +---
 reco/detectors/trd/qa/CbmTrdQa.h                            | 4 +---
 reco/eventbuilder/CbmEventBuilderLinkDef.h                  | 4 +---
 reco/eventbuilder/digis/CbmEvBuildSource.cxx                | 4 +---
 reco/eventbuilder/digis/CbmEvBuildSource.h                  | 3 ---
 reco/global/CbmEcalTrackingMuch.cxx                         | 4 +---
 reco/global/CbmEcalTrackingMuch.h                           | 4 +---
 reco/global/CbmGlobalLinkDef.h                              | 4 +---
 reco/littrack/LittrackLinkDef.h                             | 4 +---
 reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx         | 4 +---
 reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h           | 4 +---
 reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx               | 4 +---
 reco/littrack/cbm/qa/CbmLitTestMatrixMath.h                 | 4 +---
 reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx           | 4 +---
 reco/littrack/cbm/qa/material/CbmLitCheckBrem.h             | 4 +---
 .../littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx | 4 +---
 reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h  | 4 +---
 reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx | 4 +---
 reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h   | 4 +---
 reco/littrack/cbm/utils/CbmLitConverter.h                   | 4 +---
 reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h     | 4 +---
 reco/littrack/clustering/CbmClusteringLinkDef.h             | 4 +---
 reco/littrack/cuda/CudaTest.h                               | 4 +---
 reco/littrack/cuda/LitCudaHit.h                             | 4 +---
 reco/littrack/cuda/LitCudaMaterialInfo.h                    | 4 +---
 reco/littrack/cuda/LitCudaTest.cxx                          | 4 +---
 reco/littrack/cuda/LitCudaTest.h                            | 4 +---
 reco/littrack/cuda/LitCudaTrack.h                           | 4 +---
 reco/littrack/cuda/LitCudaTrackParam.h                      | 4 +---
 reco/littrack/cuda/LitCudaTypes.h                           | 4 +---
 reco/littrack/parallel/vectors/P4_F32vec4.h                 | 4 +---
 reco/littrack/parallel/vectors/PSEUDO_F32vec1.h             | 4 +---
 reco/littrack/parallel/vectors/vec_arithmetic.h             | 4 +---
 reco/littrack/std/utils/CbmLitComparators.h                 | 4 +---
 reco/littrack/std/utils/CbmLitMath.cxx                      | 4 +---
 reco/littrack/std/utils/CbmLitMath.h                        | 4 +---
 reco/littrack/std/utils/CbmLitMatrixMath.cxx                | 4 +---
 reco/littrack/std/utils/CbmLitMatrixMath.h                  | 4 +---
 reco/littrack/std/utils/CbmLitMemoryManagment.h             | 4 +---
 reco/qa/RecoQaLinkDef.h                                     | 4 +---
 .../tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx | 3 ---
 reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h       | 4 +---
 reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx          | 3 ---
 reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx       | 3 ---
 reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx        | 3 ---
 reco/tracking/BinnedTracker/CbmTrackParam2.cxx              | 3 ---
 reco/tracking/BinnedTracker/CbmTrackParam2.h                | 3 ---
 reco/tracking/BinnedTracker/ContFactory.cxx                 | 3 ---
 reco/tracking/BinnedTracker/GeoReader.cxx                   | 3 ---
 reco/tracking/BinnedTracker/HitReader.cxx                   | 3 ---
 reco/tracking/BinnedTracker/Settings.cxx                    | 3 ---
 reco/tracking/BinnedTracker/Station.cxx                     | 3 ---
 reco/tracking/BinnedTracker/Station3D.cxx                   | 3 ---
 reco/tracking/BinnedTracker/Station4D.cxx                   | 3 ---
 reco/tracking/BinnedTracker/Tracker.cxx                     | 3 ---
 reco/tracking/global/CbmGlobalTrackingQA.cxx                | 3 ---
 reco/tracking/global/CbmGlobalTrackingTask.cxx              | 3 ---
 reco/tracking/global/CbmGlobalTrackingTof.cxx               | 3 ---
 reco/tracking/global/GlobalLinkDef.h                        | 4 +---
 reco/tracking/lx/CalcStats/CalcStats.cxx                    | 4 +---
 reco/tracking/lx/CalcStats/CalcStats.h                      | 4 +---
 reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx    | 4 +---
 reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h      | 4 +---
 reco/tracking/lx/LxLinkDef.h                                | 4 +---
 reco/tracking/lx/Simple/Lx.cxx                              | 4 +---
 reco/tracking/lx/Simple/Lx.h                                | 4 +---
 reco/tracking/lx/Simple/LxCA.cxx                            | 4 +---
 reco/tracking/lx/Simple/LxCA.h                              | 4 +---
 reco/tracking/lx/Simple/LxDraw.cxx                          | 4 +---
 reco/tracking/lx/Simple/LxDraw.h                            | 4 +---
 reco/tracking/lx/Simple/LxEff.cxx                           | 3 ---
 reco/tracking/lx/Simple/LxLinkDef.h                         | 4 +---
 reco/tracking/lx/Simple/LxMC.cxx                            | 3 ---
 reco/tracking/lx/Simple/LxMC.h                              | 4 +---
 reco/tracking/lx/Simple/LxParall.cxx                        | 4 +---
 reco/tracking/lx/Simple/LxParall.h                          | 4 +---
 reco/tracking/lx/Simple/LxSettings.h                        | 4 +---
 reco/tracking/lx/Simple/LxTrackAna.cxx                      | 4 +---
 reco/tracking/lx/Simple/LxTrackAna.h                        | 4 +---
 reco/tracking/lx/Simple/LxTrackAnaSegments.cxx              | 4 +---
 reco/tracking/lx/Simple/LxTrackAnaSegments.h                | 4 +---
 reco/tracking/lx/Simple/LxTrigger.cxx                       | 4 +---
 reco/tracking/lx/Simple/LxUtils.cxx                         | 4 +---
 reco/tracking/lx/Simple/LxUtils.h                           | 4 +---
 reco/tracking/lx/TBBinned/LxTBMLTask.cxx                    | 3 ---
 reco/tracking/lx/TBBinned/LxTBTask.cxx                      | 3 ---
 reco/tracking/lx/TBBinned/LxTBTieTracks.cxx                 | 3 ---
 reco/tracking/lx/TBBinned/LxTBTrdTask.cxx                   | 3 ---
 reco/tracking/lxTriplet/Lx.cxx                              | 4 +---
 reco/tracking/lxTriplet/Lx.h                                | 4 +---
 reco/tracking/lxTriplet/LxCATriplets.cxx                    | 4 +---
 reco/tracking/lxTriplet/LxCATriplets.h                      | 4 +---
 reco/tracking/lxTriplet/LxDraw.cxx                          | 4 +---
 reco/tracking/lxTriplet/LxDraw.h                            | 4 +---
 reco/tracking/lxTriplet/LxEff.cxx                           | 4 +---
 reco/tracking/lxTriplet/LxEff.h                             | 4 +---
 reco/tracking/lxTriplet/LxLinkDef.h                         | 4 +---
 reco/tracking/lxTriplet/LxMC.cxx                            | 3 ---
 reco/tracking/lxTriplet/LxMC.h                              | 4 +---
 reco/tracking/lxTriplet/LxSettings.h                        | 4 +---
 reco/tracking/lxTriplet/LxTrackAna.cxx                      | 4 +---
 reco/tracking/lxTriplet/LxTrackAna.h                        | 4 +---
 reco/tracking/lxTriplet/LxTrackAnaSegments.cxx              | 4 +---
 reco/tracking/lxTriplet/LxTrackAnaSegments.h                | 4 +---
 reco/tracking/lxTriplet/LxUtils.cxx                         | 4 +---
 reco/tracking/lxTriplet/LxUtils.h                           | 4 +---
 reco/tracking/vector/CbmVectorLinkDef.h                     | 4 +---
 scripts/loadlib.C                                           | 3 ---
 sim/detectors/much/CbmMuch.cxx                              | 3 ---
 sim/detectors/much/CbmMuchSimLinkDef.h                      | 4 +---
 sim/detectors/psd/CbmPsdSimLinkDef.h                        | 4 +---
 sim/detectors/rich/CbmRich.cxx                              | 4 +---
 sim/detectors/rich/CbmRichSimLinkDef.h                      | 4 +---
 sim/detectors/sts/CbmStsDigitizeQa.cxx                      | 4 +---
 sim/detectors/sts/CbmStsDigitizeQa.h                        | 4 +---
 sim/detectors/sts/CbmStsDigitizeQaReport.cxx                | 4 +---
 sim/detectors/sts/CbmStsDigitizeQaReport.h                  | 4 +---
 sim/detectors/sts/CbmStsSimLinkDef.h                        | 4 +---
 sim/detectors/tof/CbmTofSimLinkDef.h                        | 4 +---
 sim/detectors/trd/CbmTrdCheckUtil.cxx                       | 4 +---
 sim/detectors/trd/CbmTrdCheckUtil.h                         | 4 +---
 sim/detectors/trd/CbmTrdDigitizer.cxx                       | 4 +---
 sim/detectors/trd/CbmTrdModuleSim.cxx                       | 4 +---
 sim/detectors/trd/CbmTrdModuleSim.h                         | 4 +---
 sim/detectors/trd/CbmTrdModuleSimR.cxx                      | 4 +---
 sim/detectors/trd/CbmTrdModuleSimR.h                        | 4 +---
 sim/detectors/trd/CbmTrdModuleSimT.cxx                      | 4 +---
 sim/detectors/trd/CbmTrdRawToDigiR.cxx                      | 4 +---
 sim/detectors/trd/CbmTrdRawToDigiR.h                        | 4 +---
 sim/detectors/trd/CbmTrdSimLinkDef.h                        | 4 +---
 sim/detectors/trd/CbmTrdTrianglePRF.h                       | 4 +---
 sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h                 | 4 +---
 sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx                | 4 +---
 sim/detectors/trd/qa/CbmTrdHitRateFastQa.h                  | 4 +---
 sim/detectors/trd/qa/CbmTrdHitRateQa.cxx                    | 4 +---
 sim/detectors/trd/qa/CbmTrdHitRateQa.h                      | 4 +---
 sim/detectors/trd/qa/CbmTrdMCQa.cxx                         | 4 +---
 sim/detectors/trd/qa/CbmTrdMCQa.h                           | 4 +---
 sim/passive/CbmCave.cxx                                     | 4 +---
 sim/passive/CbmCave.h                                       | 4 +---
 sim/passive/CbmGeoCave.h                                    | 4 +---
 sim/passive/CbmGeoPassivePar.h                              | 4 +---
 sim/passive/CbmGeoPlatform.cxx                              | 3 ---
 sim/passive/CbmGeoPlatform.h                                | 4 +---
 sim/passive/CbmMagnet.cxx                                   | 4 +---
 sim/passive/CbmMagnet.h                                     | 4 +---
 sim/passive/CbmPassiveContFact.h                            | 4 +---
 sim/passive/CbmPassiveLinkDef.h                             | 4 +---
 sim/passive/CbmPipe.cxx                                     | 4 +---
 sim/passive/CbmPipe.h                                       | 4 +---
 sim/passive/CbmPlatform.cxx                                 | 4 +---
 sim/passive/CbmPlatform.h                                   | 4 +---
 sim/response/CbmSimResponseLinkDef.h                        | 4 +---
 sim/response/base/CbmDigitizationConfig.cxx                 | 4 +---
 sim/response/base/CbmDigitizationConfig.h                   | 4 +---
 sim/transport/base/CbmSimBaseLinkDef.h                      | 4 +---
 sim/transport/gconfig/SetCuts.C                             | 4 +---
 sim/transport/gconfig/g4Config.C                            | 3 ---
 sim/transport/generators/CbmSimGeneratorsLinkDef.h          | 4 +---
 sim/transport/generators/pluto/PValues.cxx                  | 3 ---
 sim/transport/generators/pluto/Pdefines.h                   | 3 ---
 sim/transport/generators/unigen/UEvent.cxx                  | 4 +---
 sim/transport/generators/unigen/UEvent.h                    | 4 +---
 sim/transport/generators/unigen/UParticle.cxx               | 4 +---
 sim/transport/generators/unigen/UParticle.h                 | 4 +---
 sim/transport/generators/unigen/URun.cxx                    | 4 +---
 sim/transport/generators/unigen/URun.h                      | 4 +---
 sim/transport/geosetup/CbmGeoSetupLinkDef.h                 | 4 +---
 sim/transport/steer/CbmGeant3Settings.cxx                   | 4 +---
 sim/transport/steer/CbmGeant4Settings.cxx                   | 4 +---
 sim/transport/steer/CbmSimSteerLinkDef.h                    | 4 +---
 sim/transport/steer/CbmTransportConfig.cxx                  | 4 +---
 sim/transport/steer/CbmTransportConfig.h                    | 4 +---
 sim/transport/steer/CbmVMCSettings.cxx                      | 4 +---
 tutorials/TaskToAlgo/CbmAlgo.h                              | 3 ---
 tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx         | 3 ---
 tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h           | 3 ---
 tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h        | 3 ---
 tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h         | 4 +---
 tutorials/TaskToAlgo/CbmTemplateAlgo.cxx                    | 3 ---
 tutorials/TaskToAlgo/CbmTemplateAlgo.h                      | 3 ---
 tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx             | 4 +---
 2032 files changed, 895 insertions(+), 6096 deletions(-)

diff --git a/MQ/base/CbmMQChannels.cxx b/MQ/base/CbmMQChannels.cxx
index ef18376fa1..dbbb4e3424 100644
--- a/MQ/base/CbmMQChannels.cxx
+++ b/MQ/base/CbmMQChannels.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMQChannels.cxx
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMQChannels.h"
+
 #include "FairMQDevice.h"
 
 CbmMQChannels::CbmMQChannels(std::vector<std::string> allowedChannels) : fAllowedChannels {allowedChannels}
diff --git a/MQ/base/CbmMQChannels.h b/MQ/base/CbmMQChannels.h
index b239759e1f..1c1d2a1f54 100644
--- a/MQ/base/CbmMQChannels.h
+++ b/MQ/base/CbmMQChannels.h
@@ -1,8 +1,6 @@
-/** @file CbmMQChannels.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMMQCHANNELS_H_
 #define CBMMQCHANNELS_H_
+
 #include <string>
 #include <vector>
 
diff --git a/MQ/base/CbmMQDefs.h b/MQ/base/CbmMQDefs.h
index 2f97b19da1..265874c833 100644
--- a/MQ/base/CbmMQDefs.h
+++ b/MQ/base/CbmMQDefs.h
@@ -1,6 +1,3 @@
-/** @file CbmMQDefs.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //#ifdef HAVE_FAIRMQSTATEMACHINE
 //#include "FairMQStateMachine.h"
 //#endif
diff --git a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx
index 0c582c6b12..dd57dc806c 100644
--- a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx
+++ b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx
@@ -1,6 +1,3 @@
-/** @file CbmDeviceEventBuilderEtofStar2019.cxx
-  * @copyright Copyright (C) 2019-2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * CbmDeviceEventBuilderEtofStar2019.cxx
  */
diff --git a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h
index 4d5770b5f0..12894d4a7f 100644
--- a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h
+++ b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h
@@ -1,6 +1,3 @@
-/** @file CbmDeviceEventBuilderEtofStar2019.h
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * CbmDeviceEventBuilderEtofStar2019.h
  *
diff --git a/MQ/eTOF/runEventBuilderEtofStar2019.cxx b/MQ/eTOF/runEventBuilderEtofStar2019.cxx
index 79fe60b5b8..accb34e70b 100644
--- a/MQ/eTOF/runEventBuilderEtofStar2019.cxx
+++ b/MQ/eTOF/runEventBuilderEtofStar2019.cxx
@@ -1,7 +1,5 @@
-/** @file runEventBuilderEtofStar2019.cxx
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceEventBuilderEtofStar2019.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/eTOF/runTriggerHandlerEtof.cxx b/MQ/eTOF/runTriggerHandlerEtof.cxx
index 9eed68a745..58614568e5 100644
--- a/MQ/eTOF/runTriggerHandlerEtof.cxx
+++ b/MQ/eTOF/runTriggerHandlerEtof.cxx
@@ -1,7 +1,5 @@
-/** @file runTriggerHandlerEtof.cxx
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceTriggerHandlerEtof.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/hitbuilder/runHitBuilderTof.cxx b/MQ/hitbuilder/runHitBuilderTof.cxx
index 482667dc5e..e83d153b95 100644
--- a/MQ/hitbuilder/runHitBuilderTof.cxx
+++ b/MQ/hitbuilder/runHitBuilderTof.cxx
@@ -1,7 +1,5 @@
-/** @file runHitBuilderTof.cxx
-  * @copyright Copyright (C) 2018-2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceHitBuilderTof.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/mcbm/runBuildRawEvents.cxx b/MQ/mcbm/runBuildRawEvents.cxx
index e3018c843b..f0487f28dd 100644
--- a/MQ/mcbm/runBuildRawEvents.cxx
+++ b/MQ/mcbm/runBuildRawEvents.cxx
@@ -1,7 +1,5 @@
-/** @file runBuildRawEvents.cxx
-  * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceBuildRawEvents.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/mcbm/runMcbmEventSink.cxx b/MQ/mcbm/runMcbmEventSink.cxx
index 8eeee27ee7..2a34df8577 100644
--- a/MQ/mcbm/runMcbmEventSink.cxx
+++ b/MQ/mcbm/runMcbmEventSink.cxx
@@ -1,7 +1,5 @@
-/** @file runMcbmEventSink.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceMcbmEventSink.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/mcbm/runMcbmEvtBuilderWin.cxx b/MQ/mcbm/runMcbmEvtBuilderWin.cxx
index 6d9f823a72..56304f448b 100644
--- a/MQ/mcbm/runMcbmEvtBuilderWin.cxx
+++ b/MQ/mcbm/runMcbmEvtBuilderWin.cxx
@@ -1,7 +1,5 @@
-/** @file runMcbmEvtBuilderWin.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceMcbmEventBuilderWin.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/mcbm/runMcbmMonitorPulser.cxx b/MQ/mcbm/runMcbmMonitorPulser.cxx
index d2a97f577c..de4611dd83 100644
--- a/MQ/mcbm/runMcbmMonitorPulser.cxx
+++ b/MQ/mcbm/runMcbmMonitorPulser.cxx
@@ -1,7 +1,5 @@
-/** @file runMcbmMonitorPulser.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceMcbmMonitorPulser.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/mcbm/runMcbmUnpack.cxx b/MQ/mcbm/runMcbmUnpack.cxx
index 0f09133031..c5f2187569 100644
--- a/MQ/mcbm/runMcbmUnpack.cxx
+++ b/MQ/mcbm/runMcbmUnpack.cxx
@@ -1,7 +1,5 @@
-/** @file runMcbmUnpack.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceMcbmUnpack.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/monitor/runMonitorT0.cxx b/MQ/monitor/runMonitorT0.cxx
index 783219bc39..143e8b79f9 100644
--- a/MQ/monitor/runMonitorT0.cxx
+++ b/MQ/monitor/runMonitorT0.cxx
@@ -1,7 +1,5 @@
-/** @file runMonitorT0.cxx
-  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceMonitorT0.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/monitor/runMonitorTof.cxx b/MQ/monitor/runMonitorTof.cxx
index baa8f1e40f..ff2bfd50b4 100644
--- a/MQ/monitor/runMonitorTof.cxx
+++ b/MQ/monitor/runMonitorTof.cxx
@@ -1,7 +1,5 @@
-/** @file runMonitorTof.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceMonitorTof.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/sink/runDevNullSink.cxx b/MQ/sink/runDevNullSink.cxx
index a790c28e0c..f3a3c089d4 100644
--- a/MQ/sink/runDevNullSink.cxx
+++ b/MQ/sink/runDevNullSink.cxx
@@ -1,7 +1,5 @@
-/** @file runDevNullSink.cxx
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDevNullSink.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/sink/runTsaComponentSink.cxx b/MQ/sink/runTsaComponentSink.cxx
index 9c7958c95b..6179fa60ce 100644
--- a/MQ/sink/runTsaComponentSink.cxx
+++ b/MQ/sink/runTsaComponentSink.cxx
@@ -1,7 +1,5 @@
-/** @file runTsaComponentSink.cxx
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTsaComponentSink.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runMCPointSource.cxx b/MQ/source/runMCPointSource.cxx
index a579bae6ae..9599fcc990 100644
--- a/MQ/source/runMCPointSource.cxx
+++ b/MQ/source/runMCPointSource.cxx
@@ -1,7 +1,5 @@
-/** @file runMCPointSource.cxx
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMCPointSource.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runStsDigiSource.cxx b/MQ/source/runStsDigiSource.cxx
index 33c1941bf0..85edf88c78 100644
--- a/MQ/source/runStsDigiSource.cxx
+++ b/MQ/source/runStsDigiSource.cxx
@@ -1,7 +1,5 @@
-/** @file runStsDigiSource.cxx
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmStsDigiSource.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runTsaInfo.cxx b/MQ/source/runTsaInfo.cxx
index 0495cd2dad..8db38cd09d 100644
--- a/MQ/source/runTsaInfo.cxx
+++ b/MQ/source/runTsaInfo.cxx
@@ -1,7 +1,5 @@
-/** @file runTsaInfo.cxx
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMQTsaInfo.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runTsaMultiSampler.cxx b/MQ/source/runTsaMultiSampler.cxx
index dbd591a237..78182b9457 100644
--- a/MQ/source/runTsaMultiSampler.cxx
+++ b/MQ/source/runTsaMultiSampler.cxx
@@ -1,7 +1,5 @@
-/** @file runTsaMultiSampler.cxx
-  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMQTsaMultiSampler.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runTsaMultiSamplerTof.cxx b/MQ/source/runTsaMultiSamplerTof.cxx
index 7f20729041..edcb08e6f9 100644
--- a/MQ/source/runTsaMultiSamplerTof.cxx
+++ b/MQ/source/runTsaMultiSamplerTof.cxx
@@ -1,7 +1,5 @@
-/** @file runTsaMultiSamplerTof.cxx
-  * @copyright Copyright (C) 2019-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMQTsaMultiSamplerTof.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runTsaSampler.cxx b/MQ/source/runTsaSampler.cxx
index 3ffb14f5be..225408e109 100644
--- a/MQ/source/runTsaSampler.cxx
+++ b/MQ/source/runTsaSampler.cxx
@@ -1,7 +1,5 @@
-/** @file runTsaSampler.cxx
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMQTsaSampler.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/source/runTsaSamplerTof.cxx b/MQ/source/runTsaSamplerTof.cxx
index 2492c308c6..c3801da1dd 100644
--- a/MQ/source/runTsaSamplerTof.cxx
+++ b/MQ/source/runTsaSamplerTof.cxx
@@ -1,7 +1,5 @@
-/** @file runTsaSamplerTof.cxx
-  * @copyright Copyright (C) 2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMQTsaSamplerTof.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/MQ/sts/runStsLocalReco.cxx b/MQ/sts/runStsLocalReco.cxx
index be18449c1f..e3df525b4f 100644
--- a/MQ/sts/runStsLocalReco.cxx
+++ b/MQ/sts/runStsLocalReco.cxx
@@ -1,7 +1,5 @@
-/** @file runStsLocalReco.cxx
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceStsLocalReco.h"
+
 #include <iostream>
 
 #include "runFairMQDevice.h"
diff --git a/MQ/unpacker/runUnpackTofMcbm2018.cxx b/MQ/unpacker/runUnpackTofMcbm2018.cxx
index c3803db6e7..08b6e27eca 100644
--- a/MQ/unpacker/runUnpackTofMcbm2018.cxx
+++ b/MQ/unpacker/runUnpackTofMcbm2018.cxx
@@ -1,7 +1,5 @@
-/** @file runUnpackTofMcbm2018.cxx
-  * @copyright Copyright (C) 2018-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceUnpackTofMcbm2018.h"
+
 #include <iomanip>
 #include <string>
 
diff --git a/MQ/unpacker/runUnpackTofStar2018.cxx b/MQ/unpacker/runUnpackTofStar2018.cxx
index 397f036f01..ac6adfed36 100644
--- a/MQ/unpacker/runUnpackTofStar2018.cxx
+++ b/MQ/unpacker/runUnpackTofStar2018.cxx
@@ -1,7 +1,5 @@
-/** @file runUnpackTofStar2018.cxx
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceUnpackTofStar2018.h"
+
 #include "runFairMQDevice.h"
 
 namespace bpo = boost::program_options;
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h
index 1088b7d0b2..d7177b16cb 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h
@@ -1,6 +1,3 @@
-/** @file NicaCbmCutsLinkDef.h
-  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h
index 8ae0151e5f..bcab0569ec 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiCandidate.h
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 0d4f45b999..8021652b40 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiCuts.h
-  * @copyright Copyright (C) 2015-2017 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 fb089e9dbd..5cef641416 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx
@@ -1,7 +1,6 @@
-/** @file CbmAnaJpsiHist.cxx
-  * @copyright Copyright (C) 2015-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmAnaJpsiHist.h"
+
 #include "TColor.h"
 
 #include <boost/assign/list_of.hpp>
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h
index 3e07bdce5a..acd10dab67 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h
@@ -1,8 +1,6 @@
-/** @file CbmAnaJpsiHist.h
-  * @copyright Copyright (C) 2015-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_ANA_JPSI_HIST_H
 #define CBM_ANA_JPSI_HIST_H
+
 #include <string>
 #include <vector>
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h
index 4270bf3fb6..d7bbbb2b93 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiKinematicParams.h
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 9bff24bfec..8ad03bee13 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx
@@ -1,7 +1,6 @@
-/** @file CbmAnaJpsiReport.cxx
-  * @copyright Copyright (C) 2015-2019 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmAnaJpsiReport.h"
+
 #include "CbmAnaJpsiCuts.h"
 #include "CbmAnaJpsiHist.h"
 #include "CbmDrawHist.h"
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h
index 9aca054a51..018888754a 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiReport.h
-  * @copyright Copyright (C) 2015-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBMANAJPSIREPORT_H
 #define CBMANAJPSIREPORT_H
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx
index dfc9b722ca..eed38699b7 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx
@@ -1,7 +1,6 @@
-/** @file CbmAnaJpsiSuperEventReport.cxx
-  * @copyright Copyright (C) 2015-2021 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmAnaJpsiSuperEventReport.h"
+
 #include "CbmAnaJpsiCuts.h"
 #include "CbmAnaJpsiHist.h"
 #include "CbmDrawHist.h"
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h
index 8e69874848..336692ddaa 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiSuperEventReport.h
-  * @copyright Copyright (C) 2015-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBMANAJPSISUPEREVENTREPORT_H
 #define CBMANAJPSISUPEREVENTREPORT_H
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
index a8b51882d3..927a93450c 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
@@ -1,7 +1,6 @@
-/** @file CbmAnaJpsiTask.cxx
-  * @copyright Copyright (C) 2015-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmAnaJpsiTask.h"
+
 #include "CbmAnaJpsiCandidate.h"
 #include "CbmAnaJpsiCuts.h"
 #include "CbmAnaJpsiHist.h"
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h
index 951a26fbc1..e0f6a08dd4 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiTask.h
-  * @copyright Copyright (C) 2015-2017 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBMJPSIANATASK
 #define CBMJPSIANATASK
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h
index 12b3dcd20a..222e0d8632 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h
@@ -1,6 +1,4 @@
-/** @file CbmAnaJpsiUtils.h
-  * @copyright Copyright (C) 2015-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 c01e7e0f54..20942a813a 100644
--- a/analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h
+++ b/analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmJPsiAnalysisLinkDef.h
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h b/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h
index 884d68db35..b70c864870 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmConversionAnalysisLinkDef.h
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx
index f817c42a3a..3fc3db2f5a 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx
@@ -1,7 +1,5 @@
-/** @file CbmAnaDielectronStudyReportAll.cxx
-  * @copyright Copyright (C) 2012-2019 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmAnaDielectronStudyReportAll.h"
+
 #include "CbmDrawHist.h"
 #include "CbmHistManager.h"
 #include "CbmLmvmHist.h"
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h
index c24459322e..d0d7462ffb 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h
@@ -1,8 +1,6 @@
-/** @file CbmAnaDielectronStudyReportAll.h
-  * @copyright Copyright (C) 2012-2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_ANA_DIELECTRON_STUDY_REPORT_ALL
 #define CBM_ANA_DIELECTRON_STUDY_REPORT_ALL
+
 #include "CbmStudyReport.h"
 
 /**
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h b/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h
index cd9ea15bad..41fd059082 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmDiElectronAnalysisLinkDef.h
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx
index 6388ea281f..98ea6f62df 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx
@@ -1,6 +1,5 @@
-/** @file CbmHaddBase.cxx
-  * @copyright Copyright (C) 2015-2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 #include "CbmHaddBase.h"
 
 #include "TChain.h"
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx
index 87730ab9cc..a7586a4818 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx
@@ -1,6 +1,3 @@
-/** @file CbmLmvmHist.cxx
-  * @copyright Copyright (C) 2012-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * \brief Helper class for histogram names.
  * \date 2012
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h
index 188d85d3b1..b365cf913a 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h
@@ -1,8 +1,6 @@
-/** @file CbmLmvmHist.h
-  * @copyright Copyright (C) 2012-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_LMVM_HIST_H
 #define CBM_LMVM_HIST_H
+
 #include <string>
 #include <vector>
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h b/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h
index 2b293bfc9a..231aed7483 100644
--- a/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h
+++ b/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h
@@ -1,8 +1,6 @@
-/** @file AnalysisTaskMultiPairAnalysis.h
-  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSISTASKMULTIPAIRANALYSIS_H
 #define ANALYSISTASKMULTIPAIRANALYSIS_H
+
 //#####################################################
 //#                                                   #
 //#        Basic Analysis task for PairAnalysis       #
diff --git a/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h b/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
index f7692619c8..be584fcae3 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
+++ b/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmPapaLinkDef.h
-  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
index b4e4b7f45a..5095c286dc 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
@@ -1,8 +1,6 @@
-/** @file PairAnalysis.h
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef PAIRANALYSIS_H
 #define PAIRANALYSIS_H
+
 #include <THnBase.h>
 #include <TNamed.h>
 #include <TObjArray.h>
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx
index 7bd7808254..78f8e941b8 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx
@@ -1,6 +1,3 @@
-/** @file PairAnalysisFunction.cxx
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///////////////////////////////////////////////////////////////////////////
 //                PairAnalysis Function                                  //
 //                                                                       //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h
index c880e6daf5..b2993a7756 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h
@@ -1,6 +1,3 @@
-/** @file PairAnalysisMetaData.h
-  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef PAIRANALYSISMETADATA_H
 #define PAIRANALYSISMETADATA_H
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx
index 6b4db09827..7131b1e1a1 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx
@@ -1,6 +1,3 @@
-/** @file PairAnalysisSignalExt.cxx
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///////////////////////////////////////////////////////////////////////////
 //                Dielectron SignalExt                                  //
 //                                                                       //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx
index 8edfc49da3..e877a8251c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx
@@ -1,6 +1,3 @@
-/** @file PairAnalysisSignalFit.cxx
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///////////////////////////////////////////////////////////////////////////
 //                Dielectron SignalFit                                  //
 //                                                                       //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx
index ab875faa5e..b74310d3a4 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx
@@ -1,6 +1,3 @@
-/** @file PairAnalysisSignalFunc.cxx
-  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///////////////////////////////////////////////////////////////////////////
 //                Dielectron Function                                  //
 //                                                                       //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
index 87fe4a318b..0641f23280 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
@@ -1,6 +1,3 @@
-/** @file PairAnalysisSpectrum.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///////////////////////////////////////////////////////////////////////////
 //                PairAnalysisSpectrum                                   //
 //                                                                       //
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx
index 533a96a6c9..48d4c33a0e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx
@@ -1,7 +1,5 @@
-/** @file CbmFastDecayer.cxx
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmFastDecayer.h"
+
 #include "CbmStack.h"
 
 #include "FairPrimaryGenerator.h"
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h
index 7410a197ca..03a83f0877 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h
@@ -1,9 +1,7 @@
-/** @file CbmFastDecayer.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMFASTDECAYER_H
 #define CBMFASTDECAYER_H
 
+
 #include "FairGenerator.h"
 
 #include "TVirtualMCDecayer.h"
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
index 4484e7b22a..f311a4860e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
@@ -1,6 +1,3 @@
-/** @file CbmFastSim.cxx
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /////////////////////////////////////////////////////////////
 //
 //  FastSim
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h
index 7b43372a21..1ba95c6a2d 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h
@@ -1,9 +1,7 @@
-/** @file CbmFastSim.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMFASTSIM_H
 #define CBMFASTSIM_H 1
 
+
 #include "FairTask.h"
 
 #include "TClonesArray.h"
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h
index a3f872bfaa..8ac22d838e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmFastSimLinkDef.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C
index f0a5b4ec32..9063ddb6a4 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C
@@ -1,6 +1,4 @@
-/** @file SetCuts.C
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 /** 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/run_sim_fast.C b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C
index 18979459c8..31c8bf925c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C
@@ -1,6 +1,3 @@
-/** @file run_sim_fast.C
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C b/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C
index 8f332c6c38..ee6599205b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C
@@ -1,8 +1,6 @@
-/** @file merge.C
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 int merge(char* input_list = "list.txt", char* output_file = "merged.root")
 {
+
   /// set global debug level
   // gErrorIgnoreLevel = kInfo, kWarning, kError, kFatal;
   gErrorIgnoreLevel = kError;
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C b/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C
index 444e77129a..32537b614c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C
@@ -1,7 +1,5 @@
-/** @file run_common_analysis.C
-  * @copyright Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 R__ADD_INCLUDE_PATH($PWD)
+
 #include "Config_dilepton_testing.C"
 TString cfgFunc    = "Config_dilepton_";
 TString configName = "testing";
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C b/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C
index 76dfd00a92..7a59a25088 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C
@@ -1,7 +1,5 @@
-/** @file run_testing.C
-  * @copyright Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 R__ADD_INCLUDE_PATH($PWD)
+
 #include "Config_dilepton_testing.C"
 TString cfgFunc    = "Config_dilepton_";
 TString configName = "testing";
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h b/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h
index e9bbec9f3b..e2ff09911d 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmConversion2AnalysisLinkDef.h
-  * @copyright Copyright (C) 2016-2020 Fakultät für Mathematik und Naturwissenschaften, Bergische Universität Wuppertal, Wuppertal
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h
index 79fb021e9b..37aaa28c46 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionBG.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_BG
 #define CBM_KRES_CONVERSION_BG
+
 #include "CbmMCTrack.h"
 
 #include <TClonesArray.h>
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
index 3ed737c818..040d32dc86 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionCorrectedPhotons.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_CORRECTED_PHOTONS
 #define CBM_KRES_CONVERSION_CORRECTED_PHOTONS
+
 #include "CbmKFVertex.h"
 #include "CbmKresGammaCorrection.h"
 #include "CbmKresSelectAnnPhotons.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h
index 896e9ced3c..09bcd922d9 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionGeneral.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_GENERAL
 #define CBM_KRES_CONVERSION_GENERAL
+
 class TClonesArray;
 class TH1;
 class TH1D;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
index fd60dce51b..b421c9fd16 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionKF.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_KF
 #define CBM_KRES_CONVERSION_KF
+
 #include "CbmKFParticleFinder.h"
 #include "CbmKFParticleFinderQA.h"
 #include "CbmKresConversionBG.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
index 8d411aaca6..1313094cc5 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionMain.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_MAIN
 #define CBM_KRES_CONVERSION_MAIN
+
 #include "CbmKFParticleFinder.h"
 #include "CbmKFParticleFinderQA.h"
 #include "CbmKresConversionCorrectedPhotons.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h
index 6cc7badf72..45b847238b 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionManual.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_MANUAL
 #define CBM_KRES_CONVERSION_MANUAL
+
 #include "CbmKFVertex.h"
 #include "CbmKresConversionBG.h"
 #include "CbmKresSelectAnn.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h
index 02424ec62f..bc3d40be35 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionManualmbias1.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_1
 #define CBM_KRES_CONVERSION_MANUAL_mbias_1
+
 #include "CbmKFVertex.h"
 #include "CbmKresConversionBG.h"
 #include "CbmMCTrack.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h
index bab76e6535..5df5bc1d36 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionManualmbias2.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_2
 #define CBM_KRES_CONVERSION_MANUAL_mbias_2
+
 #include "CbmKFVertex.h"
 #include "CbmKresConversionBG.h"
 #include "CbmMCTrack.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h
index 009b1124e4..eb3d8416ae 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionManualmbias3.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_3
 #define CBM_KRES_CONVERSION_MANUAL_mbias_3
+
 #include "CbmKFVertex.h"
 #include "CbmKresConversionBG.h"
 #include "CbmMCTrack.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h
index da6d8ac127..5530a7b74b 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionManualmbias4.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_4
 #define CBM_KRES_CONVERSION_MANUAL_mbias_4
+
 #include "CbmKFVertex.h"
 #include "CbmKresConversionBG.h"
 #include "CbmMCTrack.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
index e95497d15c..82f0175047 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
@@ -1,8 +1,6 @@
-/** @file CbmKresConversionPhotons.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_PHOTONS
 #define CBM_KRES_CONVERSION_PHOTONS
+
 #include "CbmKFVertex.h"
 #include "CbmKresSelectAnnPhotons.h"
 #include "CbmKresTrainAnnDirectPhotons.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h
index 1ce7b6cf3d..7a0afb7ef8 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h
@@ -1,9 +1,7 @@
-/** @file CbmKresConversionReconstruction.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_CONVERSION_RECONSTRUCTION
 #define CBM_KRES_CONVERSION_RECONSTRUCTION
 
+
 class TH1;
 class TH1D;
 class TH2D;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h
index a9dd4fca27..b3244a68d4 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h
@@ -1,8 +1,6 @@
-/** @file CbmKresEta.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_ETA
 #define CBM_KRES_ETA
+
 #include "CbmKFVertex.h"
 #include "CbmMCTrack.h"
 #include "CbmRichRing.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h
index d3085aa86c..23d8bb741f 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h
@@ -1,8 +1,6 @@
-/** @file CbmKresEtaMCAnalysis.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_ETA_MC_ANALYSIS
 #define CBM_KRES_ETA_MC_ANALYSIS
+
 class TH1;
 class TH1D;
 class TH2D;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h
index 0f68ba3d8e..00efba53ea 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h
@@ -1,8 +1,6 @@
-/** @file CbmKresGammaCorrection.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_GAMMA_CORRECTION
 #define CBM_KRES_GAMMA_CORRECTION
+
 #include "TH2D.h"
 #include <TClonesArray.h>
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h
index 1362e45ea5..c672a652be 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h
@@ -1,8 +1,6 @@
-/** @file CbmKresSelectAnn.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_SELECT_ANN
 #define CBM_KRES_SELECT_ANN
+
 #include "TMultiLayerPerceptron.h"
 #include "TVector3.h"
 #include <TClonesArray.h>
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h
index fecfa5f729..63a90ac089 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h
@@ -1,8 +1,6 @@
-/** @file CbmKresSelectAnnPhotons.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_SELECT_ANN_PHOTONS
 #define CBM_KRES_SELECT_ANN_PHOTONS
+
 #include "TMultiLayerPerceptron.h"
 #include "TVector3.h"
 #include <TClonesArray.h>
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h
index 7410e057a2..f921f661b8 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h
@@ -1,9 +1,7 @@
-/** @file CbmKresSelectGoodEvents.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_SELECT_GOOD_EVENTS
 #define CBM_KRES_SELECT_GOOD_EVENTS
 
+
 #include "CbmMCTrack.h"
 
 #include "FairTask.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h
index f6b4a0922e..2c42249d38 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h
@@ -1,8 +1,6 @@
-/** @file CbmKresTemperature.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_TEMPERATURE
 #define CBM_KRES_TEMPERATURE
+
 #include <TClonesArray.h>
 
 #include <vector>
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h
index f28f2a8a04..8a750d00fa 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h
@@ -1,8 +1,6 @@
-/** @file CbmKresTrainAnn.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_TRAIN_ANN
 #define CBM_KRES_TRAIN_ANN
+
 #include "TCanvas.h"
 #include "TH2D.h"
 #include "TVector3.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h
index ebbdfc236d..f06318ee88 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h
@@ -1,8 +1,6 @@
-/** @file CbmKresTrainAnnDirectPhotons.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_KRES_TRAIN_ANN_DIRECT_PHOTONS
 #define CBM_KRES_TRAIN_ANN_DIRECT_PHOTONS
+
 #include "TCanvas.h"
 #include "TH2D.h"
 #include "TVector3.h"
diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
index 7bb210d741..05cf3cc725 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
@@ -1,6 +1,3 @@
-/** @file CbmAnaDimuonAnalysis.cxx
-  * @copyright Copyright (C) 2009-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 **/
 //----------------------------------------
 //
 // 2019 A. Senger a.senger@gsi.de
diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
index d1e2ceee9e..b2b9b90ba5 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
@@ -1,6 +1,3 @@
-/** @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 **/
 //----------------------------------------
 //
 // 2019 A. Senger a.senger@gsi.de
diff --git a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
index a88ca6b2cd..49fbcc78c8 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
+++ b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 //----------------------------------------
 //
 // 2019 A. Senger a.senger@gsi.de
diff --git a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
index 43cc055c8f..3e79c4a716 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
+++ b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
@@ -1,6 +1,3 @@
-/** @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 **/
 //----------------------------------------
 //
 // 2019 A. Senger a.senger@gsi.de
diff --git a/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h b/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h
index d109367fff..760a8f9bd3 100644
--- a/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h
+++ b/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmMuchAnalysisLinkDef.h
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/PWGHAD/hadron/CbmHadronLinkDef.h b/analysis/PWGHAD/hadron/CbmHadronLinkDef.h
index 5f82b982ba..46cd17a542 100644
--- a/analysis/PWGHAD/hadron/CbmHadronLinkDef.h
+++ b/analysis/PWGHAD/hadron/CbmHadronLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmHadronLinkDef.h
-  * @copyright Copyright (C) 2012-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h b/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
index 9e2de14609..f7d0fbb956 100644
--- a/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
+++ b/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmAnalysisTreeInterfaceLinkDef.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.cxx b/analysis/common/analysis_tree_converter/CbmConverterManager.cxx
index 8d6ad5b807..90b8b661df 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.cxx
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.cxx
@@ -1,7 +1,5 @@
-/** @file CbmConverterManager.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmConverterManager.h"
+
 #include "CbmConverterTask.h"
 
 #include "TGeoBBox.h"
diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.h b/analysis/common/analysis_tree_converter/CbmConverterManager.h
index e20f0c389b..7be50dd637 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.h
@@ -1,8 +1,6 @@
-/** @file CbmConverterManager.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_CONVERTERMANAGER_H_
 #define ANALYSIS_TREE_CONVERTERMANAGER_H_
+
 #include "FairTask.h"
 
 #include <utility>
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.cxx b/analysis/common/analysis_tree_converter/CbmConverterTask.cxx
index 6f20750e1e..59dc5bb2fb 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.cxx
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.cxx
@@ -1,4 +1 @@
-/** @file CbmConverterTask.cxx
-  * @copyright Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmConverterTask.h"
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.h b/analysis/common/analysis_tree_converter/CbmConverterTask.h
index cb176ef85e..b41925a3de 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.h
@@ -1,8 +1,6 @@
-/** @file CbmConverterTask.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_CONVERTERTASK_H_
 #define ANALYSIS_TREE_CONVERTERTASK_H_
+
 #include <map>
 #include <string>
 
diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
index bfa4a3ddc5..3b62e5cd80 100644
--- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmPsdModulesConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPsdModulesConverter.h"
+
 #include "CbmPsdHit.h"
 
 #include "FairRootManager.h"
diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h
index 4af7d15c79..53bdc8bacb 100644
--- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmPsdModulesConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_PSDMODULESCONVERTER_H_
 #define ANALYSIS_TREE_PSDMODULESCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/Detector.hpp"
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
index dcf5a1f7db..6af87b9fa2 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRecEventHeaderConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRecEventHeaderConverter.h"
+
 #include "CbmPsdHit.h"
 #include "CbmVertex.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
index 4ce325490b..53ef4c641a 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmRecEventHeaderConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_RECEVENTHEADERCONVERTER_H_
 #define ANALYSIS_TREE_RECEVENTHEADERCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/EventHeader.hpp"
diff --git a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
index 56f6f1a6c4..893f2d6e1c 100644
--- a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichRingsConverter.cxx
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichRingsConverter.h"
+
 #include <CbmGlobalTrack.h>
 #include <rich/CbmRichRing.h>
 
diff --git a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h
index dc68e05df9..5b12721f82 100644
--- a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmRichRingsConverter.h
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_RICHRINGSCONVERTER_H_
 #define ANALYSIS_TREE_RICHRINGSCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/Detector.hpp"
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
index e7bc42210d..91289b3207 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmSimEventHeaderConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmSimEventHeaderConverter.h"
+
 #include "FairMCEventHeader.h"
 #include "FairRootManager.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
index dabca37f2a..c010aec313 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmSimEventHeaderConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_SIMEVENTHEADERCONVERTER_H_
 #define ANALYSIS_TREE_SIMEVENTHEADERCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/EventHeader.hpp"
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
index 4d9652bb84..7b177aeda7 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmSimTracksConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmSimTracksConverter.h"
+
 #include "CbmMCTrack.h"
 
 #include "FairLogger.h"
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h
index 0157c53018..2bc65cd39b 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmSimTracksConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_SIMTRACKSCONVERTER_H_
 #define ANALYSIS_TREE_SIMTRACKSCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include <TString.h>
diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
index dc75dacf05..4a3eb5a867 100644
--- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmStsTracksConverter.cxx
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmStsTracksConverter.h"
+
 #include "CbmMCTrack.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
index c88a51d85f..152adb5c88 100644
--- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmStsTracksConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_STSTRACKSCONVERTER_H_
 #define ANALYSIS_TREE_STSTRACKSCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/Detector.hpp"
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
index 62aa6ee4ff..7ffe8a942c 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTofHitsConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTofHitsConverter.h"
+
 #include <CbmGlobalTrack.h>
 #include <CbmMCTrack.h>
 #include <CbmTofHit.h>
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h
index 0d060ca034..8b2d3c5065 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmTofHitsConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_TOFHITSCONVERTER_H
 #define ANALYSIS_TREE_TOFHITSCONVERTER_H
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/Detector.hpp"
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
index acbbade784..2d393653fb 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdTracksConverter.cxx
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdTracksConverter.h"
+
 #include <CbmGlobalTrack.h>
 #include <CbmTrackMatchNew.h>
 #include <CbmTrdHit.h>
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h
index 260569be7f..8adf8d8491 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdTracksConverter.h
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ANALYSIS_TREE_TRDTRACKSCONVERTER_H_
 #define ANALYSIS_TREE_TRDTRACKSCONVERTER_H_
+
 #include "CbmConverterTask.h"
 
 #include "AnalysisTree/Detector.hpp"
diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
index 2ca82e4a49..7aa1292f61 100644
--- a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
+++ b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
@@ -1,7 +1,5 @@
-/** @file ATKFParticleFinder.cxx
-  * @copyright Copyright (C) 2020-2021 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "ATKFParticleFinder.h"
+
 void ATKFParticleFinder::InitInput(const std::string& file_name, const std::string& tree_name)
 {
   std::cout << "ATKFParticleFinder::InitInput()\n";
diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.h b/analysis/common/at_kfpf_interface/ATKFParticleFinder.h
index aa1f94a888..5c65c661b0 100644
--- a/analysis/common/at_kfpf_interface/ATKFParticleFinder.h
+++ b/analysis/common/at_kfpf_interface/ATKFParticleFinder.h
@@ -1,8 +1,6 @@
-/** @file ATKFParticleFinder.h
-  * @copyright Copyright (C) 2020-2021 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef ATKFParticleFinder_HH
 #define ATKFParticleFinder_HH
+
 #include "TChain.h"
 #include "TFile.h"
 #include "TTree.h"
diff --git a/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h b/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h
index bd5837f847..e2ea9b0a7a 100644
--- a/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h
+++ b/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h
@@ -1,7 +1,5 @@
-/** @file AnalysisTreeKfpfInterfaceLinkDef.h
-  * @copyright Copyright (C) 2020 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/common/at_kfpf_interface/CutsContainer.cxx b/analysis/common/at_kfpf_interface/CutsContainer.cxx
index dbb18026c9..5a2499dc0d 100644
--- a/analysis/common/at_kfpf_interface/CutsContainer.cxx
+++ b/analysis/common/at_kfpf_interface/CutsContainer.cxx
@@ -1,4 +1 @@
-/** @file CutsContainer.cxx
-  * @copyright Copyright (C) 2020 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CutsContainer.h"
diff --git a/analysis/detectors/psd/CbmPsdAnaLinkDef.h b/analysis/detectors/psd/CbmPsdAnaLinkDef.h
index 5fcbe2ead5..87696b9880 100644
--- a/analysis/detectors/psd/CbmPsdAnaLinkDef.h
+++ b/analysis/detectors/psd/CbmPsdAnaLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmPsdAnaLinkDef.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx b/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx
index dd657d4777..e0ec184ee5 100644
--- a/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx
+++ b/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmPsdMCbmQaReal.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmEvent.h"
diff --git a/analysis/detectors/psd/CbmPsdMCbmQaReal.h b/analysis/detectors/psd/CbmPsdMCbmQaReal.h
index 1d73669168..3d9af8ddaa 100644
--- a/analysis/detectors/psd/CbmPsdMCbmQaReal.h
+++ b/analysis/detectors/psd/CbmPsdMCbmQaReal.h
@@ -1,8 +1,6 @@
-/** @file CbmPsdMCbmQaReal.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_PSD_QA_REAL
 #define MCBM_PSD_QA_REAL
+
 #include "CbmEvent.h"
 #include "CbmHistManager.h"
 
diff --git a/analysis/detectors/sts/CbmStsAnaLinkDef.h b/analysis/detectors/sts/CbmStsAnaLinkDef.h
index 33a920afc9..50b40160b0 100644
--- a/analysis/detectors/sts/CbmStsAnaLinkDef.h
+++ b/analysis/detectors/sts/CbmStsAnaLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmStsAnaLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/analysis/detectors/tof/CbmTofAnaLinkDef.h b/analysis/detectors/tof/CbmTofAnaLinkDef.h
index 509725bd4a..372ae6be2b 100644
--- a/analysis/detectors/tof/CbmTofAnaLinkDef.h
+++ b/analysis/detectors/tof/CbmTofAnaLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTofAnaLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link C++ class CbmTofTests + ;
 #pragma link C++ class CbmTofGeometryQa + ;
 #pragma link C++ class CbmTofHitFinderQa + ;
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
index cc0dc8e4e9..01e42723df 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/core/base/CbmBaseLinkDef.h b/core/base/CbmBaseLinkDef.h
index 6ea26ba0cd..d8365ddd8a 100644
--- a/core/base/CbmBaseLinkDef.h
+++ b/core/base/CbmBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmBaseLinkDef.h
-  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/core/base/CbmMCDataManager.cxx b/core/base/CbmMCDataManager.cxx
index 2ef929b1fb..d85984aa5f 100644
--- a/core/base/CbmMCDataManager.cxx
+++ b/core/base/CbmMCDataManager.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMCDataManager.cxx
-  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMCDataManager.h"
+
 #include "CbmMCDataArray.h"   // for CbmMCDataArray
 #include "CbmMCDataObject.h"  // for CbmMCDataObject
 
diff --git a/core/base/utils/CbmFileUtils.cxx b/core/base/utils/CbmFileUtils.cxx
index 53d666dafe..af4b150a40 100644
--- a/core/base/utils/CbmFileUtils.cxx
+++ b/core/base/utils/CbmFileUtils.cxx
@@ -1,7 +1,5 @@
-/** @file CbmFileUtils.cxx
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmFileUtils.h"
+
 #include "FairLogger.h"  // for LOG, info and error
 
 #include "TArchiveFile.h"  // for TArchiveFile
diff --git a/core/base/utils/CbmFileUtils.h b/core/base/utils/CbmFileUtils.h
index 26e3171ea2..a1be2369aa 100644
--- a/core/base/utils/CbmFileUtils.h
+++ b/core/base/utils/CbmFileUtils.h
@@ -1,8 +1,6 @@
-/** @file CbmFileUtils.h
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMFILEUTILS_H_
 #define CBMFILEUTILS_H_
+
 #include <string>  // for string
 
 namespace Cbm
diff --git a/core/base/utils/CbmGeometryUtils.cxx b/core/base/utils/CbmGeometryUtils.cxx
index 86e6640270..df2bfcd08e 100644
--- a/core/base/utils/CbmGeometryUtils.cxx
+++ b/core/base/utils/CbmGeometryUtils.cxx
@@ -1,7 +1,5 @@
-/** @file CbmGeometryUtils.cxx
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmGeometryUtils.h"
+
 #include <FairGeoBuilder.h>    // for FairGeoBuilder
 #include <FairGeoInterface.h>  // for FairGeoInterface
 #include <FairGeoLoader.h>     // for FairGeoLoader
diff --git a/core/base/utils/CbmGeometryUtils.h b/core/base/utils/CbmGeometryUtils.h
index e986e610ca..ba0b23bca1 100644
--- a/core/base/utils/CbmGeometryUtils.h
+++ b/core/base/utils/CbmGeometryUtils.h
@@ -1,6 +1,3 @@
-/** @file CbmGeometryUtils.h
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 class TGeoMatrix;
 class TGeoVolume;
 class FairModule;
diff --git a/core/base/utils/CbmMediaList.cxx b/core/base/utils/CbmMediaList.cxx
index 97ae90144e..2bf9aabfc0 100644
--- a/core/base/utils/CbmMediaList.cxx
+++ b/core/base/utils/CbmMediaList.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMediaList.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMediaList.h"
+
 void CbmMediaList::AddEntry(TString path, TString medium) { fMatList.push_back(std::make_pair(path, medium)); }
 
 ClassImp(CbmMediaList)
diff --git a/core/base/utils/CbmUtils.cxx b/core/base/utils/CbmUtils.cxx
index ea3ecdc501..880c0d1ec3 100644
--- a/core/base/utils/CbmUtils.cxx
+++ b/core/base/utils/CbmUtils.cxx
@@ -1,7 +1,5 @@
-/** @file CbmUtils.cxx
-  * @copyright Copyright (C) 2010-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmUtils.h"
+
 #include <RtypesCore.h>  // for Int_t
 #include <TAxis.h>       // for TAxis
 #include <TCanvas.h>     // for TCanvas
diff --git a/core/base/utils/CbmUtils.h b/core/base/utils/CbmUtils.h
index ca05b3afa9..d7403cc0c3 100644
--- a/core/base/utils/CbmUtils.h
+++ b/core/base/utils/CbmUtils.h
@@ -1,8 +1,6 @@
-/** @file CbmUtils.h
-  * @copyright Copyright (C) 2010-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMUTILS_H_
 #define CBMUTILS_H_
+
 #include <sstream>  // for string, stringstream
 #include <vector>   // for vector
 
diff --git a/core/config/CbmConfigBase.h b/core/config/CbmConfigBase.h
index e1f0cdb3cf..9dc07e2658 100644
--- a/core/config/CbmConfigBase.h
+++ b/core/config/CbmConfigBase.h
@@ -1,7 +1,5 @@
-/** @file CbmConfigBase.h
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #pragma once
+
 #include "CbmDefs.h"
 
 #include <FairLogger.h>
diff --git a/core/data/CbmDefs.cxx b/core/data/CbmDefs.cxx
index 5067aac073..055e20df6a 100644
--- a/core/data/CbmDefs.cxx
+++ b/core/data/CbmDefs.cxx
@@ -1,7 +1,5 @@
-/** @file CbmDefs.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDefs.h"
+
 #include <stdexcept>  // for out_of_range
 #include <string>     // for to_string
 
diff --git a/core/data/DataLinkDef.h b/core/data/DataLinkDef.h
index c6c70c99f7..bb8f3bc87f 100644
--- a/core/data/DataLinkDef.h
+++ b/core/data/DataLinkDef.h
@@ -1,7 +1,5 @@
-/** @file DataLinkDef.h
-  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/core/data/much/CbmMuchAddress.cxx b/core/data/much/CbmMuchAddress.cxx
index 3c515991a7..d728402a10 100644
--- a/core/data/much/CbmMuchAddress.cxx
+++ b/core/data/much/CbmMuchAddress.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmMuchAddress.h"
+
 #include "CbmDefs.h"  // for kMuch
 
 #include <iomanip>  // for setw, __iom_t6
diff --git a/core/data/much/CbmMuchAddress.h b/core/data/much/CbmMuchAddress.h
index 08d0f03bd5..7f7da9b206 100644
--- a/core/data/much/CbmMuchAddress.h
+++ b/core/data/much/CbmMuchAddress.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CBMMUCHADDRESS_H
 #define CBMMUCHADDRESS_H 1
+
 #include "CbmAddress.h"  // for CbmAddress
 
 #include <Logger.h>  // for Logger, LOG
diff --git a/core/data/much/CbmMuchCluster.cxx b/core/data/much/CbmMuchCluster.cxx
index 416edd8382..88a0828d97 100644
--- a/core/data/much/CbmMuchCluster.cxx
+++ b/core/data/much/CbmMuchCluster.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMuchCluster.cxx
-  * @copyright Copyright (C) 2007-2013 St. Petersburg Polytechnic University, St. Petersburg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * \file CbmMuchCluster.cxx
  **/
diff --git a/core/data/mvd/CbmMvdCluster.cxx b/core/data/mvd/CbmMvdCluster.cxx
index b7923f8a0f..3266c9e6ec 100644
--- a/core/data/mvd/CbmMvdCluster.cxx
+++ b/core/data/mvd/CbmMvdCluster.cxx
@@ -1,8 +1,6 @@
-/** @file CbmMvdCluster.cxx
-  * @copyright Copyright (C) 2008-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                CbmMvdCluster source file                  -----
+
 // -------------------------------------------------------------------------
 
 #include "CbmMvdCluster.h"
diff --git a/core/data/mvd/CbmMvdCluster.h b/core/data/mvd/CbmMvdCluster.h
index 7c32db1dfe..658ef54580 100644
--- a/core/data/mvd/CbmMvdCluster.h
+++ b/core/data/mvd/CbmMvdCluster.h
@@ -1,6 +1,3 @@
-/** @file CbmMvdCluster.h
-  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                      CbmMvdCluster header file            -----
 // -----
diff --git a/core/data/raw/StsXyterFinalHit.h b/core/data/raw/StsXyterFinalHit.h
index 3d1ff1f2c4..c29e758a95 100644
--- a/core/data/raw/StsXyterFinalHit.h
+++ b/core/data/raw/StsXyterFinalHit.h
@@ -1,6 +1,3 @@
-/** @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 **/
 /************************************************************
  *
  ************************************************************/
diff --git a/core/data/raw/StsXyterMessage.cxx b/core/data/raw/StsXyterMessage.cxx
index a9630b3b3b..cc9f397616 100644
--- a/core/data/raw/StsXyterMessage.cxx
+++ b/core/data/raw/StsXyterMessage.cxx
@@ -1,7 +1,6 @@
-/** @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 **/
+
 #include "StsXyterMessage.h"
+
 // tools
 
 
diff --git a/core/data/raw/StsXyterMessage.h b/core/data/raw/StsXyterMessage.h
index cc7c23ad1d..929f378dd4 100644
--- a/core/data/raw/StsXyterMessage.h
+++ b/core/data/raw/StsXyterMessage.h
@@ -1,6 +1,3 @@
-/** @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 **/
 /************************************************************
  *
  ************************************************************/
diff --git a/core/data/raw/TimesliceMetaData.cxx b/core/data/raw/TimesliceMetaData.cxx
index 6f217813b7..89d0991075 100644
--- a/core/data/raw/TimesliceMetaData.cxx
+++ b/core/data/raw/TimesliceMetaData.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "TimesliceMetaData.h"
+
 #include <TObject.h>  // for TObject
 
 TimesliceMetaData::TimesliceMetaData(ULong64_t ulStart, ULong64_t ulDur, ULong64_t ulOverDur, ULong64_t ulIndex)
diff --git a/core/data/raw/TimesliceMetaData.h b/core/data/raw/TimesliceMetaData.h
index 60ad46e605..9cb2e778d1 100644
--- a/core/data/raw/TimesliceMetaData.h
+++ b/core/data/raw/TimesliceMetaData.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef TIMESLICE_METADATA_H
 #define TIMESLICE_METADATA_H
+
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for ULong64_t
 #include <TObject.h>     // for TObject
diff --git a/core/data/raw/gDpbMessv100.cxx b/core/data/raw/gDpbMessv100.cxx
index 5c389ed5c0..bb5ad979e9 100644
--- a/core/data/raw/gDpbMessv100.cxx
+++ b/core/data/raw/gDpbMessv100.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "gDpbMessv100.h"
+
 // Specific headers
 
 // C++11 headers
diff --git a/core/data/raw/gDpbMessv100.h b/core/data/raw/gDpbMessv100.h
index a5a7c98e1e..cf513d289c 100644
--- a/core/data/raw/gDpbMessv100.h
+++ b/core/data/raw/gDpbMessv100.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef GDPB_MESS_V1_00_DEF_H
 #define GDPB_MESS_V1_00_DEF_H
+
 #include <iostream>
 
 #include <stdint.h>
diff --git a/core/data/rich/CbmRichRing.cxx b/core/data/rich/CbmRichRing.cxx
index f9cd33c09a..91311a3ade 100644
--- a/core/data/rich/CbmRichRing.cxx
+++ b/core/data/rich/CbmRichRing.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichRing.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /* $Id: CbmRichRing.cxx,v 1.8 2006/09/13 14:51:28 hoehne Exp $*/
+
 /* History of CVS commits:
  *
  * $Log: CbmRichRing.cxx,v $
diff --git a/core/data/rich/CbmRichTrbDigi.cxx b/core/data/rich/CbmRichTrbDigi.cxx
index 898ab01973..f2366a9464 100644
--- a/core/data/rich/CbmRichTrbDigi.cxx
+++ b/core/data/rich/CbmRichTrbDigi.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichTrbDigi.cxx
-  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichTrbDigi.h"
+
 #include <TObject.h>  // for TObject
 
 CbmRichTrbDigi::CbmRichTrbDigi()
diff --git a/core/data/rich/CbmRichTrbDigi.h b/core/data/rich/CbmRichTrbDigi.h
index bf4bc5b3c2..2d94e0971b 100644
--- a/core/data/rich/CbmRichTrbDigi.h
+++ b/core/data/rich/CbmRichTrbDigi.h
@@ -1,8 +1,6 @@
-/** @file CbmRichTrbDigi.h
-  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHTRBDIGI_H
 #define CBMRICHTRBDIGI_H
+
 #include <Rtypes.h>      // for ClassDef
 #include <RtypesCore.h>  // for UInt_t, Double_t, Bool_t
 #include <TObject.h>     // for TObject
diff --git a/core/data/test/TestCbmHit.C b/core/data/test/TestCbmHit.C
index 9f10298960..d684e89aea 100644
--- a/core/data/test/TestCbmHit.C
+++ b/core/data/test/TestCbmHit.C
@@ -1,6 +1,3 @@
-/** @file TestCbmHit.C
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //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 e442b1c0dd..08fa1b47c8 100644
--- a/core/data/test/TestCbmPixelHit.C
+++ b/core/data/test/TestCbmPixelHit.C
@@ -1,6 +1,3 @@
-/** @file TestCbmPixelHit.C
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //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 21d75a51a4..e8a1416443 100644
--- a/core/data/test/_GTestCbmAddress.cxx
+++ b/core/data/test/_GTestCbmAddress.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmAddress.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmAddress.h"
 #include "CbmDefs.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/_GTestCbmCluster.cxx b/core/data/test/_GTestCbmCluster.cxx
index d4ab3edf72..7f4f1e6fd4 100644
--- a/core/data/test/_GTestCbmCluster.cxx
+++ b/core/data/test/_GTestCbmCluster.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmCluster.cxx
-  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmCluster.h"
 #include "CbmMatch.h"
+
 #include <vector>
 
 #include "compareCluster.h"
diff --git a/core/data/test/_GTestCbmConstants.cxx b/core/data/test/_GTestCbmConstants.cxx
index dfda7ef80f..1235e88b68 100644
--- a/core/data/test/_GTestCbmConstants.cxx
+++ b/core/data/test/_GTestCbmConstants.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmConstants.cxx
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDefs.h"
+
 #include <Rtypes.h>
 
 #include <gtest/gtest-spi.h>
diff --git a/core/data/test/_GTestCbmDefs.cxx b/core/data/test/_GTestCbmDefs.cxx
index f07c066be5..48439bafa5 100644
--- a/core/data/test/_GTestCbmDefs.cxx
+++ b/core/data/test/_GTestCbmDefs.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmDefs.cxx
-  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDetectorList.h"
+
 #include <TString.h>
 
 #include <iostream>
diff --git a/core/data/test/_GTestCbmDigi.cxx b/core/data/test/_GTestCbmDigi.cxx
index 14f3f88a4d..f67cc81ba9 100644
--- a/core/data/test/_GTestCbmDigi.cxx
+++ b/core/data/test/_GTestCbmDigi.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmDigi.cxx
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDigi.h"
 #include "CbmMatch.h"
+
 #include <utility>  // std::forward
 
 #include "gtest/gtest-spi.h"
diff --git a/core/data/test/_GTestCbmErrorMessage.cxx b/core/data/test/_GTestCbmErrorMessage.cxx
index d40b1cce8c..f4ed5705fd 100644
--- a/core/data/test/_GTestCbmErrorMessage.cxx
+++ b/core/data/test/_GTestCbmErrorMessage.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmErrorMessage.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmErrorMessage.h"
+
 #include "compareErrorMessage.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/_GTestCbmEvent.cxx b/core/data/test/_GTestCbmEvent.cxx
index 49ff997c03..91e91dc393 100644
--- a/core/data/test/_GTestCbmEvent.cxx
+++ b/core/data/test/_GTestCbmEvent.cxx
@@ -1,6 +1,3 @@
-/** @file _GTestCbmEvent.cxx
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDefs.h"
 #include "CbmEvent.h"
 #include "CbmMatch.h"
diff --git a/core/data/test/_GTestCbmHit.cxx b/core/data/test/_GTestCbmHit.cxx
index 6566f3090f..ec4526e963 100644
--- a/core/data/test/_GTestCbmHit.cxx
+++ b/core/data/test/_GTestCbmHit.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmHit.cxx
-  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmHit.h"
 #include "CbmMatch.h"
+
 #include "compareHit.h"
 #include "compareMatch.h"
 #include "gtest/gtest-spi.h"
diff --git a/core/data/test/_GTestCbmLink.cxx b/core/data/test/_GTestCbmLink.cxx
index 10cda39db9..ccb62b033e 100644
--- a/core/data/test/_GTestCbmLink.cxx
+++ b/core/data/test/_GTestCbmLink.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmLink.cxx
-  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmLink.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/_GTestCbmMatch.cxx b/core/data/test/_GTestCbmMatch.cxx
index cee170580a..c3ac66abb4 100644
--- a/core/data/test/_GTestCbmMatch.cxx
+++ b/core/data/test/_GTestCbmMatch.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmMatch.cxx
-  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmLink.h"
 #include "CbmMatch.h"
+
 #include "compareLink.h"
 #include "compareMatch.h"
 #include "gtest/gtest-spi.h"
diff --git a/core/data/test/_GTestCbmModuleList.cxx b/core/data/test/_GTestCbmModuleList.cxx
index 7dbb0c2251..6cb6df0cd5 100644
--- a/core/data/test/_GTestCbmModuleList.cxx
+++ b/core/data/test/_GTestCbmModuleList.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmModuleList.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmModuleList.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/_GTestCbmPixelHit.cxx b/core/data/test/_GTestCbmPixelHit.cxx
index 818c3a69f5..51c62bbd0b 100644
--- a/core/data/test/_GTestCbmPixelHit.cxx
+++ b/core/data/test/_GTestCbmPixelHit.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmPixelHit.cxx
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPixelHit.h"
+
 #include <TVector3.h>
 
 #include <gtest/gtest-spi.h>
diff --git a/core/data/test/_GTestCbmStripHit.cxx b/core/data/test/_GTestCbmStripHit.cxx
index 7199c176b7..47b667afdb 100644
--- a/core/data/test/_GTestCbmStripHit.cxx
+++ b/core/data/test/_GTestCbmStripHit.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmStripHit.cxx
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmStripHit.h"
+
 #include <TVector3.h>
 
 #include <gtest/gtest-spi.h>
diff --git a/core/data/test/compareCluster.h b/core/data/test/compareCluster.h
index d01dd00324..94b1524e3b 100644
--- a/core/data/test/compareCluster.h
+++ b/core/data/test/compareCluster.h
@@ -1,8 +1,6 @@
-/** @file compareCluster.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARECLUSTER_H
 #define COMPARECLUSTER_H 1
+
 #include "CbmCluster.h"
 #include "CbmMatch.h"
 
diff --git a/core/data/test/compareDigi.h b/core/data/test/compareDigi.h
index d63fac50ae..59020e0060 100644
--- a/core/data/test/compareDigi.h
+++ b/core/data/test/compareDigi.h
@@ -1,8 +1,6 @@
-/** @file compareDigi.h
-  * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREDIGI_H
 #define COMPAREDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void compareDigiDataMembers(CbmTestDigi& test, Int_t address, Double_t charge, Int_t systemid, Double_t time)
diff --git a/core/data/test/compareErrorMessage.h b/core/data/test/compareErrorMessage.h
index eaa9f6bf4b..9bf4d9062a 100644
--- a/core/data/test/compareErrorMessage.h
+++ b/core/data/test/compareErrorMessage.h
@@ -1,8 +1,6 @@
-/** @file compareErrorMessage.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREERRORMESSAGE_H
 #define COMPAREERRORMESSAGE_H 1
+
 #include "CbmErrorMessage.h"
 
 #include "gtest/gtest.h"
diff --git a/core/data/test/compareFairMCPoint.h b/core/data/test/compareFairMCPoint.h
index 3e416f0b69..dd96069d66 100644
--- a/core/data/test/compareFairMCPoint.h
+++ b/core/data/test/compareFairMCPoint.h
@@ -1,8 +1,6 @@
-/** @file compareFairMCPoint.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREFAIRMCPOINT_H
 #define COMPAREFAIRMCPOINT_H 1
+
 #include <FairMCPoint.h>
 
 #include <TVector3.h>
diff --git a/core/data/test/compareHit.h b/core/data/test/compareHit.h
index 5e60c2cd1b..017d56deb8 100644
--- a/core/data/test/compareHit.h
+++ b/core/data/test/compareHit.h
@@ -1,8 +1,6 @@
-/** @file compareHit.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREHIT_H
 #define COMPAREHIT_H 1
+
 #include "CbmHit.h"
 #include "CbmMatch.h"
 
diff --git a/core/data/test/compareLink.h b/core/data/test/compareLink.h
index 74fc2ab1db..3b41d138d3 100644
--- a/core/data/test/compareLink.h
+++ b/core/data/test/compareLink.h
@@ -1,8 +1,6 @@
-/** @file compareLink.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARELINK_H
 #define COMPARELINK_H 1
+
 #include "CbmLink.h"
 
 #include "gtest/gtest.h"
diff --git a/core/data/test/compareMatch.h b/core/data/test/compareMatch.h
index 1151c26244..6d34d24667 100644
--- a/core/data/test/compareMatch.h
+++ b/core/data/test/compareMatch.h
@@ -1,8 +1,6 @@
-/** @file compareMatch.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREMATCH_H
 #define COMPAREMATCH_H 1
+
 #include "CbmLink.h"
 #include "CbmMatch.h"
 
diff --git a/core/data/test/comparePixelHit.h b/core/data/test/comparePixelHit.h
index e19216a9c5..c900b354bc 100644
--- a/core/data/test/comparePixelHit.h
+++ b/core/data/test/comparePixelHit.h
@@ -1,8 +1,6 @@
-/** @file comparePixelHit.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREPIXELHIT_H
 #define COMPAREPIXELHIT_H 1
+
 #include "CbmMatch.h"
 #include "CbmPixelHit.h"
 
diff --git a/core/data/test/compareStripHit.h b/core/data/test/compareStripHit.h
index bedd8ca7f1..b63f203d06 100644
--- a/core/data/test/compareStripHit.h
+++ b/core/data/test/compareStripHit.h
@@ -1,8 +1,6 @@
-/** @file compareStripHit.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARESTRIPHIT_H
 #define COMPARESTRIPHIT_H 1
+
 #include "CbmMatch.h"
 #include "CbmStripHit.h"
 
diff --git a/core/data/test/compareVertex.h b/core/data/test/compareVertex.h
index d2f785fd01..fe9d96d36f 100644
--- a/core/data/test/compareVertex.h
+++ b/core/data/test/compareVertex.h
@@ -1,7 +1,5 @@
-/** @file compareVertex.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "gtest/gtest.h"
+
 void compareVertexDataMembers(CbmVertex& test, Double_t x, Double_t y, Double_t z, Double_t chi2, Int_t ndf,
                               Int_t ntracks, Double_t* cov)
 {
diff --git a/core/data/test/global/_GTestCbmVertex.cxx b/core/data/test/global/_GTestCbmVertex.cxx
index d72e8dd932..9e02027570 100644
--- a/core/data/test/global/_GTestCbmVertex.cxx
+++ b/core/data/test/global/_GTestCbmVertex.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmVertex.cxx
-  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmVertex.h"
+
 #include <Logger.h>
 
 #include <TMatrixTSym.h>
diff --git a/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx b/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx
index 1748962e45..2dcf38a987 100644
--- a/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx
+++ b/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmMuchBeamTimeDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMuchBeamTimeDigi.h"
+
 #include "compareMuchBeamTimeDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/much/_GTestCbmMuchDigi.cxx b/core/data/test/much/_GTestCbmMuchDigi.cxx
index 170883dace..a97a5e6d11 100644
--- a/core/data/test/much/_GTestCbmMuchDigi.cxx
+++ b/core/data/test/much/_GTestCbmMuchDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmMuchDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMuchDigi.h"
+
 #include "compareMuchDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/much/compareMuchBeamTimeDigi.h b/core/data/test/much/compareMuchBeamTimeDigi.h
index a19883b5aa..d786d968dc 100644
--- a/core/data/test/much/compareMuchBeamTimeDigi.h
+++ b/core/data/test/much/compareMuchBeamTimeDigi.h
@@ -1,8 +1,6 @@
-/** @file compareMuchBeamTimeDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREMUCHBEAMTIMEDIGI_H
 #define COMPAREMUCHBEAMTIMEDIGI_H 1
+
 #include "compareMuchDigi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/much/compareMuchDigi.h b/core/data/test/much/compareMuchDigi.h
index 33ef7e5201..829d59e4b2 100644
--- a/core/data/test/much/compareMuchDigi.h
+++ b/core/data/test/much/compareMuchDigi.h
@@ -1,8 +1,6 @@
-/** @file compareMuchDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREMUCHDIGI_H
 #define COMPAREMUCHDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void compareMuchDigiDataMembers(CbmMuchDigi& test, Int_t address, ECbmModuleId systemid, ULong64_t time, Int_t charge)
diff --git a/core/data/test/psd/_GTestCbmPsdAddress.cxx b/core/data/test/psd/_GTestCbmPsdAddress.cxx
index abb596970d..8825ecf186 100644
--- a/core/data/test/psd/_GTestCbmPsdAddress.cxx
+++ b/core/data/test/psd/_GTestCbmPsdAddress.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmPsdAddress.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPsdAddress.h"
+
 #include "comparePsdAddress.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/psd/_GTestCbmPsdDigi.cxx b/core/data/test/psd/_GTestCbmPsdDigi.cxx
index f198ca0870..4154b90419 100644
--- a/core/data/test/psd/_GTestCbmPsdDigi.cxx
+++ b/core/data/test/psd/_GTestCbmPsdDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmPsdDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPsdDigi.h"
+
 #include "comparePsdDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/psd/_GTestCbmPsdHit.cxx b/core/data/test/psd/_GTestCbmPsdHit.cxx
index 3fa753aae8..250c3d79c2 100644
--- a/core/data/test/psd/_GTestCbmPsdHit.cxx
+++ b/core/data/test/psd/_GTestCbmPsdHit.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmPsdHit.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPsdHit.h"
+
 #include "comparePsdHit.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/psd/_GTestCbmPsdPoint.cxx b/core/data/test/psd/_GTestCbmPsdPoint.cxx
index c8c2a9c165..5ed71e85f6 100644
--- a/core/data/test/psd/_GTestCbmPsdPoint.cxx
+++ b/core/data/test/psd/_GTestCbmPsdPoint.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmPsdPoint.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPsdPoint.h"
+
 #include "comparePsdPoint.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/psd/comparePsdAddress.h b/core/data/test/psd/comparePsdAddress.h
index 4ffba0a5ec..b060582b17 100644
--- a/core/data/test/psd/comparePsdAddress.h
+++ b/core/data/test/psd/comparePsdAddress.h
@@ -1,8 +1,6 @@
-/** @file comparePsdAddress.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREPSDDIGI_H
 #define COMPAREPSDDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void comparePsdAddressDataMembers(Int_t address, ECbmModuleId systemid, Int_t moduleid, Int_t sectionid)
diff --git a/core/data/test/psd/comparePsdDigi.h b/core/data/test/psd/comparePsdDigi.h
index aa56726208..69ca34bd7d 100644
--- a/core/data/test/psd/comparePsdDigi.h
+++ b/core/data/test/psd/comparePsdDigi.h
@@ -1,8 +1,6 @@
-/** @file comparePsdDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREPSDDIGI_H
 #define COMPAREPSDDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void comparePsdDigiDataMembers(CbmPsdDigi& test, Int_t address, ECbmModuleId systemid, Double_t time, Double_t edep)
diff --git a/core/data/test/psd/comparePsdHit.h b/core/data/test/psd/comparePsdHit.h
index de9a86da25..cc916811f1 100644
--- a/core/data/test/psd/comparePsdHit.h
+++ b/core/data/test/psd/comparePsdHit.h
@@ -1,8 +1,6 @@
-/** @file comparePsdHit.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREPSDHIT_H
 #define COMPAREPSDHIT_H 1
+
 #include "gtest/gtest.h"
 
 void comparePsdHitDataMembers(CbmPsdHit& test, Int_t moduleid, Double_t edep)
diff --git a/core/data/test/psd/comparePsdPoint.h b/core/data/test/psd/comparePsdPoint.h
index 1a85119c6e..5ddb47214a 100644
--- a/core/data/test/psd/comparePsdPoint.h
+++ b/core/data/test/psd/comparePsdPoint.h
@@ -1,8 +1,6 @@
-/** @file comparePsdPoint.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPAREPSDPOINT_H
 #define COMPAREPSDPOINT_H 1
+
 #include "compareFairMCPoint.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/rich/_GTestCbmRichDigi.cxx b/core/data/test/rich/_GTestCbmRichDigi.cxx
index f7668958df..123c9d2494 100644
--- a/core/data/test/rich/_GTestCbmRichDigi.cxx
+++ b/core/data/test/rich/_GTestCbmRichDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmRichDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichDigi.h"
+
 #include "compareRichDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/rich/compareRichDigi.h b/core/data/test/rich/compareRichDigi.h
index 706fbc3120..c57a25d839 100644
--- a/core/data/test/rich/compareRichDigi.h
+++ b/core/data/test/rich/compareRichDigi.h
@@ -1,8 +1,6 @@
-/** @file compareRichDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARERICHDIGI_H
 #define COMPARERICHDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void compareRichDigiDataMembers(CbmRichDigi& test, Int_t address, ECbmModuleId systemid, Double_t time, Double_t tot)
diff --git a/core/data/test/sts/_GTestCbmStsDigi.cxx b/core/data/test/sts/_GTestCbmStsDigi.cxx
index cd50a5a751..d504e8b1d5 100644
--- a/core/data/test/sts/_GTestCbmStsDigi.cxx
+++ b/core/data/test/sts/_GTestCbmStsDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmStsDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmStsDigi.h"
+
 #include "compareStsDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/sts/compareStsDigi.h b/core/data/test/sts/compareStsDigi.h
index f14f0b2566..00896c3121 100644
--- a/core/data/test/sts/compareStsDigi.h
+++ b/core/data/test/sts/compareStsDigi.h
@@ -1,8 +1,6 @@
-/** @file compareStsDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARESTSDIGI_H
 #define COMPARESTSDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void compareStsDigiDataMembers(CbmStsDigi& test, Int_t address, UShort_t charge, UShort_t channel,
diff --git a/core/data/test/tof/_GTestCbmTofDigi.cxx b/core/data/test/tof/_GTestCbmTofDigi.cxx
index 171a6aae0e..dd415a5431 100644
--- a/core/data/test/tof/_GTestCbmTofDigi.cxx
+++ b/core/data/test/tof/_GTestCbmTofDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmTofDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTofDigi.h"
+
 #include "compareTofDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/tof/compareTofDigi.h b/core/data/test/tof/compareTofDigi.h
index 7c78525dc9..6c4e8a63de 100644
--- a/core/data/test/tof/compareTofDigi.h
+++ b/core/data/test/tof/compareTofDigi.h
@@ -1,8 +1,6 @@
-/** @file compareTofDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARETOFDIGI_H
 #define COMPARETOFDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void compareTofDigiDataMembers(CbmTofDigi& test, Int_t address, ECbmModuleId systemid, Double_t time, Double_t tot)
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId.cxx
index f6b7cb8706..d1d4f58e20 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmTrdDetectorId.cxx
-  * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdAddress.h"
+
 #include <TString.h>
 
 #include <iostream>
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx
index d5bfd1f00e..cd5b28de5f 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmTrdDetectorId_simple.cxx
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx
index 3a7d262127..7dae14ca87 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmTrdDetectorId_simple1.cxx
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx
index 1fdfc3ffb0..6a1a1bdcac 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmTrdDetectorId_simple2.cxx
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx
index 33a5ebe65c..f4509cda45 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx
@@ -1,8 +1,6 @@
-/** @file _GTestCbmTrdDetectorId_simple3.cxx
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
+
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdDigi.cxx b/core/data/test/trd/_GTestCbmTrdDigi.cxx
index af36cc3708..ea402dc131 100644
--- a/core/data/test/trd/_GTestCbmTrdDigi.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDigi.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmTrdDigi.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdDigi.h"
+
 #include "compareTrdDigi.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/trd/_GTestCbmTrdHit.cxx b/core/data/test/trd/_GTestCbmTrdHit.cxx
index 47fd5e09cc..72d9e18267 100644
--- a/core/data/test/trd/_GTestCbmTrdHit.cxx
+++ b/core/data/test/trd/_GTestCbmTrdHit.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmTrdHit.cxx
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdHit.h"
+
 #include "compareTrdHit.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/trd/_GTestCbmTrdPoint.cxx b/core/data/test/trd/_GTestCbmTrdPoint.cxx
index 9cc1253fe4..0128397d37 100644
--- a/core/data/test/trd/_GTestCbmTrdPoint.cxx
+++ b/core/data/test/trd/_GTestCbmTrdPoint.cxx
@@ -1,7 +1,5 @@
-/** @file _GTestCbmTrdPoint.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdPoint.h"
+
 #include "compareTrdPoint.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
diff --git a/core/data/test/trd/compareTrdDigi.h b/core/data/test/trd/compareTrdDigi.h
index caab311491..847a87beca 100644
--- a/core/data/test/trd/compareTrdDigi.h
+++ b/core/data/test/trd/compareTrdDigi.h
@@ -1,8 +1,6 @@
-/** @file compareTrdDigi.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARETRDDIGI_H
 #define COMPARETRDDIGI_H 1
+
 #include "gtest/gtest.h"
 
 void compareTrdDigiDataMembers(CbmTrdDigi& test, Int_t padChNr, ECbmModuleId systemid, ULong64_t time, Double_t charge)
diff --git a/core/data/test/trd/compareTrdHit.h b/core/data/test/trd/compareTrdHit.h
index 0e2680dd3a..043ec3eb65 100644
--- a/core/data/test/trd/compareTrdHit.h
+++ b/core/data/test/trd/compareTrdHit.h
@@ -1,8 +1,6 @@
-/** @file compareTrdHit.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARETRDHIT_H
 #define COMPARETRDHIT_H 1
+
 #include "comparePixelHit.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/trd/compareTrdPoint.h b/core/data/test/trd/compareTrdPoint.h
index 623db9776b..3ec39612bc 100644
--- a/core/data/test/trd/compareTrdPoint.h
+++ b/core/data/test/trd/compareTrdPoint.h
@@ -1,8 +1,6 @@
-/** @file compareTrdPoint.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef COMPARETRDPOINT_H
 #define COMPARETRDPOINT_H 1
+
 #include "compareFairMCPoint.h"
 #include "gtest/gtest.h"
 
diff --git a/core/data/trd/CbmTrdDigi.cxx b/core/data/trd/CbmTrdDigi.cxx
index 85b75c3979..c2a8c9f904 100644
--- a/core/data/trd/CbmTrdDigi.cxx
+++ b/core/data/trd/CbmTrdDigi.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdDigi.cxx
-  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdDigi.h"
+
 #include "CbmTrdAddress.h"  // for CbmTrdAddress
 
 #include <Logger.h>  // for LOG
diff --git a/core/data/trd/CbmTrdDigi.h b/core/data/trd/CbmTrdDigi.h
index ed62c17ce1..b72fddcc12 100644
--- a/core/data/trd/CbmTrdDigi.h
+++ b/core/data/trd/CbmTrdDigi.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdDigi.h
-  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDDIGI_H
 #define CBMTRDDIGI_H
+
 #include "CbmDefs.h"  // for kTrd
 
 #include <Rtypes.h>      // for ClassDef
diff --git a/core/data/trd/CbmTrdRawMessageSpadic.cxx b/core/data/trd/CbmTrdRawMessageSpadic.cxx
index 29467f729b..9faa6fd390 100644
--- a/core/data/trd/CbmTrdRawMessageSpadic.cxx
+++ b/core/data/trd/CbmTrdRawMessageSpadic.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdRawMessageSpadic.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdRawMessageSpadic.h"
+
 #include <Logger.h>  // for LOG
 
 #include <algorithm>  // for max_element
diff --git a/core/detectors/much/CbmMuchBaseLinkDef.h b/core/detectors/much/CbmMuchBaseLinkDef.h
index 399553bfe1..9c85a16463 100644
--- a/core/detectors/much/CbmMuchBaseLinkDef.h
+++ b/core/detectors/much/CbmMuchBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmMuchBaseLinkDef.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/core/detectors/much/CbmMuchPad.cxx b/core/detectors/much/CbmMuchPad.cxx
index e2bcf50449..3d03597541 100644
--- a/core/detectors/much/CbmMuchPad.cxx
+++ b/core/detectors/much/CbmMuchPad.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMuchPad.cxx
-  * @copyright Copyright (C) 2007-2017 St. Petersburg Polytechnic University, St. Petersburg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMuchPad.h"
+
 // -------------------------------------------------------------------------
 CbmMuchPad::CbmMuchPad()
   : fAddress(0)
diff --git a/core/detectors/much/CbmMuchSector.cxx b/core/detectors/much/CbmMuchSector.cxx
index bc7f202493..513e551e1a 100644
--- a/core/detectors/much/CbmMuchSector.cxx
+++ b/core/detectors/much/CbmMuchSector.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMuchSector.cxx
-  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMuchSector.h"
+
 #include <Logger.h>  // for Logger, LOG
 
 #include <vector>  // for vector
diff --git a/core/detectors/much/CbmMuchSectorRectangular.cxx b/core/detectors/much/CbmMuchSectorRectangular.cxx
index e4b88a6435..7f4bc4f89e 100644
--- a/core/detectors/much/CbmMuchSectorRectangular.cxx
+++ b/core/detectors/much/CbmMuchSectorRectangular.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmMuchSectorRectangular.h"
+
 #include "CbmMuchAddress.h"         // for CbmMuchAddress, kMuchChannel
 #include "CbmMuchPadRectangular.h"  // for CbmMuchPadRectangular
 
diff --git a/core/detectors/psd/CbmPsdBaseLinkDef.h b/core/detectors/psd/CbmPsdBaseLinkDef.h
index cf480b42a4..f422f17148 100644
--- a/core/detectors/psd/CbmPsdBaseLinkDef.h
+++ b/core/detectors/psd/CbmPsdBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 // $Id: TofLinkDef.h,v 1.3 2006/03/07 11:51:55 friese Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/core/detectors/psd/PolynomComplexRoots.h b/core/detectors/psd/PolynomComplexRoots.h
index 65a2afe6d1..a6630b9ad6 100644
--- a/core/detectors/psd/PolynomComplexRoots.h
+++ b/core/detectors/psd/PolynomComplexRoots.h
@@ -1,8 +1,6 @@
-/** @file PolynomComplexRoots.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iomanip>
 #include <iostream>
+
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/core/detectors/psd/PolynomRealRoots.h b/core/detectors/psd/PolynomRealRoots.h
index 7c1ce6f961..d82462f1d2 100644
--- a/core/detectors/psd/PolynomRealRoots.h
+++ b/core/detectors/psd/PolynomRealRoots.h
@@ -1,7 +1,5 @@
-/** @file PolynomRealRoots.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <cmath>
+
 //*************************************************************************
 float polinom(int n, float x, float* k)
 {
diff --git a/core/detectors/psd/PronyFitter.cxx b/core/detectors/psd/PronyFitter.cxx
index 96bd036b7f..b44175dd6f 100644
--- a/core/detectors/psd/PronyFitter.cxx
+++ b/core/detectors/psd/PronyFitter.cxx
@@ -1,7 +1,5 @@
-/** @file PronyFitter.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "PronyFitter.h"
+
 #include "PolynomComplexRoots.h"
 #include "PolynomRealRoots.h"
 
diff --git a/core/detectors/rich/CbmMcbm2018RichPar.cxx b/core/detectors/rich/CbmMcbm2018RichPar.cxx
index 5346e5eed7..598746b141 100644
--- a/core/detectors/rich/CbmMcbm2018RichPar.cxx
+++ b/core/detectors/rich/CbmMcbm2018RichPar.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMcbm2018RichPar.cxx
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
+
 	TODO: If the TBR addess is not provided in the par file but found in the data file,
 	The std::map::at will throw out an exception which is not currectly caught.
 
diff --git a/core/detectors/rich/CbmMcbm2018RichPar.h b/core/detectors/rich/CbmMcbm2018RichPar.h
index 04a486d761..21aca2691a 100644
--- a/core/detectors/rich/CbmMcbm2018RichPar.h
+++ b/core/detectors/rich/CbmMcbm2018RichPar.h
@@ -1,8 +1,6 @@
-/** @file CbmMcbm2018RichPar.h
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmMcbm2018RichPar_H
 #define CbmMcbm2018RichPar_H
+
 #include "FairParGenericSet.h"  // mother class
 
 // STD
diff --git a/core/detectors/rich/CbmRichBaseLinkDef.h b/core/detectors/rich/CbmRichBaseLinkDef.h
index 248f13661b..93a371a3e1 100644
--- a/core/detectors/rich/CbmRichBaseLinkDef.h
+++ b/core/detectors/rich/CbmRichBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRichBaseLinkDef.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/core/detectors/rich/CbmRichDraw.h b/core/detectors/rich/CbmRichDraw.h
index dda0f42f2a..7ee35f74fc 100644
--- a/core/detectors/rich/CbmRichDraw.h
+++ b/core/detectors/rich/CbmRichDraw.h
@@ -1,6 +1,4 @@
-/** @file CbmRichDraw.h
-  * @copyright Copyright (C) 2016-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef RICH_CbmRichDraw
 #define RICH_CbmRichDraw
 
diff --git a/core/detectors/sts/CbmStsBaseLinkDef.h b/core/detectors/sts/CbmStsBaseLinkDef.h
index e8c507d6a1..22171bcc85 100644
--- a/core/detectors/sts/CbmStsBaseLinkDef.h
+++ b/core/detectors/sts/CbmStsBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmStsBaseLinkDef.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/core/detectors/tof/CbmTofCell.cxx b/core/detectors/tof/CbmTofCell.cxx
index 581de4bfaa..837b149db3 100644
--- a/core/detectors/tof/CbmTofCell.cxx
+++ b/core/detectors/tof/CbmTofCell.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTofCell.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTofCell.h"
+
 #include <Logger.h>  // for Logger, LOG
 
 #include <TGeoManager.h>  // for gGeoManager
diff --git a/core/detectors/tof/CbmTofCell.h b/core/detectors/tof/CbmTofCell.h
index 103d356a3b..7af5b32a74 100644
--- a/core/detectors/tof/CbmTofCell.h
+++ b/core/detectors/tof/CbmTofCell.h
@@ -1,8 +1,6 @@
-/** @file CbmTofCell.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTOFCELL_H
 #define CBMTOFCELL_H 1
+
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Double_t, Int_t, Option_t
 #include <TNamed.h>      // for TNamed
diff --git a/core/detectors/tof/CbmTofContFact.h b/core/detectors/tof/CbmTofContFact.h
index e430c5ac08..3104fd087d 100644
--- a/core/detectors/tof/CbmTofContFact.h
+++ b/core/detectors/tof/CbmTofContFact.h
@@ -1,8 +1,6 @@
-/** @file CbmTofContFact.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTOFCONTFACT_H
 #define CBMTOFCONTFACT_H
+
 #include <FairContFact.h>  // for FairContFact
 
 #include <Rtypes.h>  // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/tof/CbmTofDigiPar.cxx b/core/detectors/tof/CbmTofDigiPar.cxx
index 4f808f789c..c6c126902f 100644
--- a/core/detectors/tof/CbmTofDigiPar.cxx
+++ b/core/detectors/tof/CbmTofDigiPar.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTofDigiPar.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTofDigiPar.h"
+
 #include "CbmTofCell.h"  // for CbmTofCell
 
 #include <FairParGenericSet.h>  // for FairParGenericSet
diff --git a/core/detectors/tof/CbmTofDigiPar.h b/core/detectors/tof/CbmTofDigiPar.h
index 2145f3b1bf..2b9bee200c 100644
--- a/core/detectors/tof/CbmTofDigiPar.h
+++ b/core/detectors/tof/CbmTofDigiPar.h
@@ -1,8 +1,6 @@
-/** @file CbmTofDigiPar.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTOFDIGIPAR_H
 #define CBMTOFDIGIPAR_H
+
 #include <FairParGenericSet.h>  // for FairParGenericSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/tof/TTrbHeader.cxx b/core/detectors/tof/TTrbHeader.cxx
index fb9f1dd6ed..1c34adbf22 100644
--- a/core/detectors/tof/TTrbHeader.cxx
+++ b/core/detectors/tof/TTrbHeader.cxx
@@ -1,7 +1,5 @@
-/** @file TTrbHeader.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TTrbHeader.h"
+
 #include <TNamed.h>  // for TNamed
 
 #include <algorithm>  // for fill
diff --git a/core/detectors/tof/TTrbHeader.h b/core/detectors/tof/TTrbHeader.h
index 55d082a76c..850db48cb8 100644
--- a/core/detectors/tof/TTrbHeader.h
+++ b/core/detectors/tof/TTrbHeader.h
@@ -1,8 +1,6 @@
-/** @file TTrbHeader.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef TTRBHEADER_H_
 #define TTRBHEADER_H_
+
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Double_t, UInt_t, Int_t, UShort_t, Bool_t
 #include <TNamed.h>      // for TNamed
diff --git a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h
index 7673a7358b..36c2ef2465 100644
--- a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h
+++ b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h
@@ -1,8 +1,6 @@
-/** @file CbmMcbm2020TrdTshiftPar.h
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmMcbm2020TrdTshiftPar_H
 #define CbmMcbm2020TrdTshiftPar_H
+
 #include "FairParGenericSet.h"  // mother class
 
 // STD
diff --git a/core/detectors/trd/CbmTrdBaseLinkDef.h b/core/detectors/trd/CbmTrdBaseLinkDef.h
index 9b5c380441..6e8fa9a452 100644
--- a/core/detectors/trd/CbmTrdBaseLinkDef.h
+++ b/core/detectors/trd/CbmTrdBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTrdBaseLinkDef.h
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: TrdBaseLinkDef.h $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/core/detectors/trd/CbmTrdContFact.h b/core/detectors/trd/CbmTrdContFact.h
index 5fec630e9e..f3bed29b21 100644
--- a/core/detectors/trd/CbmTrdContFact.h
+++ b/core/detectors/trd/CbmTrdContFact.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdContFact.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDCONTFACT_H
 #define CBMTRDCONTFACT_H
+
 #include "FairContFact.h"  // for FairContFact
 
 #include <Rtypes.h>  // for ClassDef
diff --git a/core/detectors/trd/CbmTrdFASP.cxx b/core/detectors/trd/CbmTrdFASP.cxx
index ca743e405d..aaf4300bfa 100644
--- a/core/detectors/trd/CbmTrdFASP.cxx
+++ b/core/detectors/trd/CbmTrdFASP.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmTrdFASP.h"
+
 #include "CbmMatch.h"    // for CbmMatch
 #include "CbmTrdDigi.h"  // for CbmTrdDigi, CbmTrdDigi::kFASP
 
diff --git a/core/detectors/trd/CbmTrdFASP.h b/core/detectors/trd/CbmTrdFASP.h
index ae471ff0d8..12ec19766a 100644
--- a/core/detectors/trd/CbmTrdFASP.h
+++ b/core/detectors/trd/CbmTrdFASP.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CBMTRDFASP_H
 #define CBMTRDFASP_H
+
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Int_t, Float_t, ULong64_t, UInt_t, Bool_t
 #include <TObject.h>     // for TObject
diff --git a/core/detectors/trd/CbmTrdGas.cxx b/core/detectors/trd/CbmTrdGas.cxx
index 13bc53fd66..256b6c2bcd 100644
--- a/core/detectors/trd/CbmTrdGas.cxx
+++ b/core/detectors/trd/CbmTrdGas.cxx
@@ -1,6 +1,3 @@
-/** @file CbmTrdGas.cxx
-  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * \file CbmTrdGas.cxx
  * \brief Container for gas properties of TRD.
diff --git a/core/detectors/trd/CbmTrdGas.h b/core/detectors/trd/CbmTrdGas.h
index 1f86b8c0eb..e716bbd1a1 100644
--- a/core/detectors/trd/CbmTrdGas.h
+++ b/core/detectors/trd/CbmTrdGas.h
@@ -1,6 +1,3 @@
-/** @file CbmTrdGas.h
-  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * \file CbmTrdGas.h
  * \brief Container for gas properties of TRD.
diff --git a/core/detectors/trd/CbmTrdLinkDef.h b/core/detectors/trd/CbmTrdLinkDef.h
index 236c5156ed..639df8c3aa 100644
--- a/core/detectors/trd/CbmTrdLinkDef.h
+++ b/core/detectors/trd/CbmTrdLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTrdLinkDef.h
-  * @copyright Copyright (C) 2006-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: TrdLinkDef.h,v 1.10 2006/06/20 09:39:59 kresan Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/core/detectors/trd/CbmTrdModuleAbstract.cxx b/core/detectors/trd/CbmTrdModuleAbstract.cxx
index 0217564da2..2af78bc33d 100644
--- a/core/detectors/trd/CbmTrdModuleAbstract.cxx
+++ b/core/detectors/trd/CbmTrdModuleAbstract.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdModuleAbstract.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdModuleAbstract.h"
+
 //_______________________________________________________________________________
 CbmTrdModuleAbstract::CbmTrdModuleAbstract()
   : TNamed()
diff --git a/core/detectors/trd/CbmTrdModuleAbstract.h b/core/detectors/trd/CbmTrdModuleAbstract.h
index c4ad1efc7b..988a417075 100644
--- a/core/detectors/trd/CbmTrdModuleAbstract.h
+++ b/core/detectors/trd/CbmTrdModuleAbstract.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleAbstract.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMODULEABSTRACT_H
 #define CBMTRDMODULEABSTRACT_H
+
 #include "CbmTrdParModDigi.h"  // for CbmTrdParModDigi
 #include "CbmTrdParModGeo.h"   // for CbmTrdParModGeo
 #include "CbmTrdParSetAsic.h"  // for CbmTrdParSetAsic
diff --git a/core/detectors/trd/CbmTrdParAsic.cxx b/core/detectors/trd/CbmTrdParAsic.cxx
index 01fb234701..ac07bf03f0 100644
--- a/core/detectors/trd/CbmTrdParAsic.cxx
+++ b/core/detectors/trd/CbmTrdParAsic.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParAsic.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParAsic.h"
+
 #include <Logger.h>  // for Logger, LOG
 
 #include <stdio.h>  // for printf
diff --git a/core/detectors/trd/CbmTrdParAsic.h b/core/detectors/trd/CbmTrdParAsic.h
index 0e6a6ad75e..285022feea 100644
--- a/core/detectors/trd/CbmTrdParAsic.h
+++ b/core/detectors/trd/CbmTrdParAsic.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParAsic.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARASIC_H
 #define CBMTRDPARASIC_H
+
 #include "CbmTrdParMod.h"  // for CbmTrdParMod
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParFasp.cxx b/core/detectors/trd/CbmTrdParFasp.cxx
index 28ac950eff..94691de553 100644
--- a/core/detectors/trd/CbmTrdParFasp.cxx
+++ b/core/detectors/trd/CbmTrdParFasp.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParFasp.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParFasp.h"
+
 #include <FairParamList.h>  // for FairParamList
 
 #include <TArrayI.h>            // for TArrayI
diff --git a/core/detectors/trd/CbmTrdParFasp.h b/core/detectors/trd/CbmTrdParFasp.h
index c49f09c65f..dc8dbf609d 100644
--- a/core/detectors/trd/CbmTrdParFasp.h
+++ b/core/detectors/trd/CbmTrdParFasp.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParFasp.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARFASP_H
 #define CBMTRDPARFASP_H
+
 #define NFASPCH 16
 
 #include "CbmTrdParAsic.h"  // for CbmTrdParAsic
diff --git a/core/detectors/trd/CbmTrdParMod.cxx b/core/detectors/trd/CbmTrdParMod.cxx
index ea77292d5a..46f00ab022 100644
--- a/core/detectors/trd/CbmTrdParMod.cxx
+++ b/core/detectors/trd/CbmTrdParMod.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParMod.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParMod.h"
+
 #include <Logger.h>  // for LOG
 
 //___________________________________________________________________
diff --git a/core/detectors/trd/CbmTrdParMod.h b/core/detectors/trd/CbmTrdParMod.h
index bf17380c27..b792722de3 100644
--- a/core/detectors/trd/CbmTrdParMod.h
+++ b/core/detectors/trd/CbmTrdParMod.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParMod.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARMOD_H
 #define CBMTRDPARMOD_H
+
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Int_t
 #include <TNamed.h>      // for TNamed
diff --git a/core/detectors/trd/CbmTrdParModDigi.cxx b/core/detectors/trd/CbmTrdParModDigi.cxx
index 7295370884..3aba537c28 100644
--- a/core/detectors/trd/CbmTrdParModDigi.cxx
+++ b/core/detectors/trd/CbmTrdParModDigi.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParModDigi.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParModDigi.h"
+
 #include "CbmTrdAddress.h"  // for CbmTrdAddress
 #include "CbmTrdPoint.h"    // for CbmTrdPoint
 
diff --git a/core/detectors/trd/CbmTrdParModDigi.h b/core/detectors/trd/CbmTrdParModDigi.h
index 4a13305af1..18fb0475cb 100644
--- a/core/detectors/trd/CbmTrdParModDigi.h
+++ b/core/detectors/trd/CbmTrdParModDigi.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParModDigi.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARMODDIGI_H
 #define CBMTRDPARMODDIGI_H
+
 #include "CbmTrdParMod.h"  // for CbmTrdParMod
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParModGain.cxx b/core/detectors/trd/CbmTrdParModGain.cxx
index 248878ab2b..f89b20b93c 100644
--- a/core/detectors/trd/CbmTrdParModGain.cxx
+++ b/core/detectors/trd/CbmTrdParModGain.cxx
@@ -1,7 +1,6 @@
-/** @file CbmTrdParModGain.cxx
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParModGain.h"
+
+
 //___________________________________________________________________
 CbmTrdParModGain::CbmTrdParModGain(const char* name, const char* title) : CbmTrdParMod(name, title) {}
 
diff --git a/core/detectors/trd/CbmTrdParModGain.h b/core/detectors/trd/CbmTrdParModGain.h
index 03eaf70a82..dadb61f6f4 100644
--- a/core/detectors/trd/CbmTrdParModGain.h
+++ b/core/detectors/trd/CbmTrdParModGain.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParModGain.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARMODGAIN_H
 #define CBMTRDPARMODGAIN_H
+
 #include "CbmTrdParMod.h"  // for CbmTrdParMod
 
 #include <Rtypes.h>  // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParModGas.cxx b/core/detectors/trd/CbmTrdParModGas.cxx
index 0de972684e..235c110d2a 100644
--- a/core/detectors/trd/CbmTrdParModGas.cxx
+++ b/core/detectors/trd/CbmTrdParModGas.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParModGas.cxx
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParModGas.h"
+
 #include <Logger.h>  // for Logger, LOG
 
 #include <TAxis.h>              // for TAxis
diff --git a/core/detectors/trd/CbmTrdParModGas.h b/core/detectors/trd/CbmTrdParModGas.h
index fa54d28c82..ec406830ad 100644
--- a/core/detectors/trd/CbmTrdParModGas.h
+++ b/core/detectors/trd/CbmTrdParModGas.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParModGas.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARMODGAS_H
 #define CBMTRDPARMODGAS_H
+
 #include "CbmTrdParMod.h"  // for CbmTrdParMod
 
 #include <Rtypes.h>      // for CLRBIT, SETBIT, TESTBIT, THashConsistencyH...
diff --git a/core/detectors/trd/CbmTrdParModGeo.cxx b/core/detectors/trd/CbmTrdParModGeo.cxx
index fd8d404ed2..0fd39166d3 100644
--- a/core/detectors/trd/CbmTrdParModGeo.cxx
+++ b/core/detectors/trd/CbmTrdParModGeo.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParModGeo.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParModGeo.h"
+
 #include <TGeoBBox.h>          // for TGeoBBox
 #include <TGeoMatrix.h>        // for TGeoHMatrix
 #include <TGeoPhysicalNode.h>  // for TGeoPhysicalNode
diff --git a/core/detectors/trd/CbmTrdParModGeo.h b/core/detectors/trd/CbmTrdParModGeo.h
index f6498ecda1..abad885456 100644
--- a/core/detectors/trd/CbmTrdParModGeo.h
+++ b/core/detectors/trd/CbmTrdParModGeo.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParModGeo.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARMODGEO_H
 #define CBMTRDPARMODGEO_H
+
 #include "CbmTrdParMod.h"  // for CbmTrdParMod
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSet.cxx b/core/detectors/trd/CbmTrdParSet.cxx
index 83c1afd322..0b007d9757 100644
--- a/core/detectors/trd/CbmTrdParSet.cxx
+++ b/core/detectors/trd/CbmTrdParSet.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSet.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSet.h"
+
 #include "CbmTrdParMod.h"  // for CbmTrdParMod
 
 #include <FairParGenericSet.h>  // for FairParGenericSet
diff --git a/core/detectors/trd/CbmTrdParSet.h b/core/detectors/trd/CbmTrdParSet.h
index da27ba83ce..c60cc0d17e 100644
--- a/core/detectors/trd/CbmTrdParSet.h
+++ b/core/detectors/trd/CbmTrdParSet.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSet.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSET_H
 #define CBMTRDPARSET_H
+
 #include "FairParGenericSet.h"  // for FairParGenericSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSetAsic.cxx b/core/detectors/trd/CbmTrdParSetAsic.cxx
index 6270127427..3c7acf0413 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.cxx
+++ b/core/detectors/trd/CbmTrdParSetAsic.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSetAsic.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSetAsic.h"
+
 #include "CbmTrdParAsic.h"    // for CbmTrdParAsic
 #include "CbmTrdParFasp.h"    // for CbmTrdParFasp, NFASPCH, CbmTrdParFasp...
 #include "CbmTrdParMod.h"     // for CbmTrdParMod
diff --git a/core/detectors/trd/CbmTrdParSetAsic.h b/core/detectors/trd/CbmTrdParSetAsic.h
index 1a00035ec0..f9a571c7a3 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.h
+++ b/core/detectors/trd/CbmTrdParSetAsic.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSetAsic.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSETASIC_H
 #define CBMTRDPARSETASIC_H
+
 #include "CbmTrdParSet.h"  // for CbmTrdParSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSetDigi.cxx b/core/detectors/trd/CbmTrdParSetDigi.cxx
index 367b2b99d3..4447f409be 100644
--- a/core/detectors/trd/CbmTrdParSetDigi.cxx
+++ b/core/detectors/trd/CbmTrdParSetDigi.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSetDigi.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSetDigi.h"
+
 #include "CbmTrdParMod.h"      // for CbmTrdParMod
 #include "CbmTrdParModDigi.h"  // for CbmTrdParModDigi
 
diff --git a/core/detectors/trd/CbmTrdParSetDigi.h b/core/detectors/trd/CbmTrdParSetDigi.h
index af36ed0e82..a49ab72388 100644
--- a/core/detectors/trd/CbmTrdParSetDigi.h
+++ b/core/detectors/trd/CbmTrdParSetDigi.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSetDigi.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSETDIGI_H
 #define CBMTRDPARSETDIGI_H
+
 #include "CbmTrdParSet.h"  // for CbmTrdParSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSetGain.cxx b/core/detectors/trd/CbmTrdParSetGain.cxx
index c869f78118..7563954693 100644
--- a/core/detectors/trd/CbmTrdParSetGain.cxx
+++ b/core/detectors/trd/CbmTrdParSetGain.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSetGain.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSetGain.h"
+
 #include <FairParamList.h>  // for FairParamList
 #include <Logger.h>         // for LOG, Logger
 
diff --git a/core/detectors/trd/CbmTrdParSetGain.h b/core/detectors/trd/CbmTrdParSetGain.h
index 40a69fa44c..d75a54b1dc 100644
--- a/core/detectors/trd/CbmTrdParSetGain.h
+++ b/core/detectors/trd/CbmTrdParSetGain.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSetGain.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSETGAIN_H
 #define CBMTRDPARSETGAIN_H
+
 #include "CbmTrdParSet.h"  // for CbmTrdParSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSetGas.cxx b/core/detectors/trd/CbmTrdParSetGas.cxx
index 0d52b9355c..f0417c6068 100644
--- a/core/detectors/trd/CbmTrdParSetGas.cxx
+++ b/core/detectors/trd/CbmTrdParSetGas.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSetGas.cxx
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSetGas.h"
+
 #include "CbmTrdParModGas.h"  // for CbmTrdParModGas
 
 #include <FairParamList.h>  // for FairParamList
diff --git a/core/detectors/trd/CbmTrdParSetGas.h b/core/detectors/trd/CbmTrdParSetGas.h
index ce21002689..ffbb8453bd 100644
--- a/core/detectors/trd/CbmTrdParSetGas.h
+++ b/core/detectors/trd/CbmTrdParSetGas.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSetGas.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSETGAS_H
 #define CBMTRDPARSETGAS_H
+
 #include "CbmTrdParSet.h"  // for CbmTrdParSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSetGeo.cxx b/core/detectors/trd/CbmTrdParSetGeo.cxx
index 2f1b50f02f..afbd8e0fd1 100644
--- a/core/detectors/trd/CbmTrdParSetGeo.cxx
+++ b/core/detectors/trd/CbmTrdParSetGeo.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSetGeo.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSetGeo.h"
+
 #include "CbmTrdGeoHandler.h"  // for CbmTrdGeoHandler
 #include "CbmTrdParModGeo.h"   // for CbmTrdParModGeo
 
diff --git a/core/detectors/trd/CbmTrdParSetGeo.h b/core/detectors/trd/CbmTrdParSetGeo.h
index d668e66a04..0b109c6561 100644
--- a/core/detectors/trd/CbmTrdParSetGeo.h
+++ b/core/detectors/trd/CbmTrdParSetGeo.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSetGeo.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSETGEO_H
 #define CBMTRDPARSETGEO_H
+
 #include "CbmTrdParSet.h"  // for CbmTrdParSet
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/detectors/trd/CbmTrdParSpadic.cxx b/core/detectors/trd/CbmTrdParSpadic.cxx
index 5d2c2b083b..ba4fd9c2a9 100644
--- a/core/detectors/trd/CbmTrdParSpadic.cxx
+++ b/core/detectors/trd/CbmTrdParSpadic.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdParSpadic.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdParSpadic.h"
+
 #include "CbmTrdDefs.h"  // for eCbmTrdModuleTypes, eCbmTrdModuleType...
 
 #include <FairParamList.h>  // for FairParamList
diff --git a/core/detectors/trd/CbmTrdParSpadic.h b/core/detectors/trd/CbmTrdParSpadic.h
index 02cd4cf2fe..be6a34bdbb 100644
--- a/core/detectors/trd/CbmTrdParSpadic.h
+++ b/core/detectors/trd/CbmTrdParSpadic.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdParSpadic.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDPARSPADIC_H
 #define CBMTRDPARSPADIC_H
+
 #define NSPADICCH 32
 
 #include "CbmTrdParAsic.h"  // for CbmTrdParAsic
diff --git a/core/detectors/trd/CbmTrdSPADIC.cxx b/core/detectors/trd/CbmTrdSPADIC.cxx
index 0a99995bb3..d660581cdc 100644
--- a/core/detectors/trd/CbmTrdSPADIC.cxx
+++ b/core/detectors/trd/CbmTrdSPADIC.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdSPADIC.cxx
-  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdSPADIC.h"
+
 #include "CbmTrdAddress.h"     // for CbmTrdAddress
 #include "CbmTrdDigi.h"        // for CbmTrdDigi
 #include "CbmTrdGeoHandler.h"  // for CbmTrdGeoHandler
diff --git a/core/detectors/trd/CbmTrdUtils.h b/core/detectors/trd/CbmTrdUtils.h
index 4e0c210b49..a4e465650f 100644
--- a/core/detectors/trd/CbmTrdUtils.h
+++ b/core/detectors/trd/CbmTrdUtils.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdUtils.h
-  * @copyright Copyright (C) 2013-2020 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDUTILS_H
 #define CBMTRDUTILS_H 1
+
 #include <RtypesCore.h>  // for Int_t, Double_t, Bool_t
 #include <TString.h>     // for TString
 
diff --git a/core/eventdisplay/CbmDisplayLinkDef.h b/core/eventdisplay/CbmDisplayLinkDef.h
index 6c8c0db374..38f32e594b 100644
--- a/core/eventdisplay/CbmDisplayLinkDef.h
+++ b/core/eventdisplay/CbmDisplayLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmDisplayLinkDef.h
-  * @copyright Copyright (C) 2009-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: TrdLinkDef.h,v 1.10 2006/06/20 09:39:59 kresan Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/core/eventdisplay/CbmPixelHitSetDraw.cxx b/core/eventdisplay/CbmPixelHitSetDraw.cxx
index 089b996345..c55b699892 100644
--- a/core/eventdisplay/CbmPixelHitSetDraw.cxx
+++ b/core/eventdisplay/CbmPixelHitSetDraw.cxx
@@ -1,7 +1,5 @@
-/** @file CbmPixelHitSetDraw.cxx
-  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPixelHitSetDraw.h"
+
 #include "CbmPixelHit.h"  // for CbmPixelHit
 
 #include <Logger.h>  // for LOG, Logger
diff --git a/core/eventdisplay/CbmPixelHitSetDraw.h b/core/eventdisplay/CbmPixelHitSetDraw.h
index b3c94754d7..daed534ec2 100644
--- a/core/eventdisplay/CbmPixelHitSetDraw.h
+++ b/core/eventdisplay/CbmPixelHitSetDraw.h
@@ -1,8 +1,6 @@
-/** @file CbmPixelHitSetDraw.h
-  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMPIXELHITSETDRAW_H_
 #define CBMPIXELHITSETDRAW_H_
+
 #include <FairPointSetDraw.h>  // for FairPointSetDraw
 
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
diff --git a/core/field/CbmFieldCreator.cxx b/core/field/CbmFieldCreator.cxx
index fa0edc9b60..84cf438f64 100644
--- a/core/field/CbmFieldCreator.cxx
+++ b/core/field/CbmFieldCreator.cxx
@@ -1,7 +1,5 @@
-/** @file CbmFieldCreator.cxx
-  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmFieldCreator.h"
+
 #include "CbmBsField.h"            // for CbmBsField
 #include "CbmFieldConst.h"         // for CbmFieldConst
 #include "CbmFieldMap.h"           // for CbmFieldMap
diff --git a/core/field/CbmFieldLinkDef.h b/core/field/CbmFieldLinkDef.h
index f302bf6b0e..d2409103ac 100644
--- a/core/field/CbmFieldLinkDef.h
+++ b/core/field/CbmFieldLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmFieldLinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/core/field/CbmFieldMapData.cxx b/core/field/CbmFieldMapData.cxx
index aebd1ba7d9..97ea76b49a 100644
--- a/core/field/CbmFieldMapData.cxx
+++ b/core/field/CbmFieldMapData.cxx
@@ -1,6 +1,3 @@
-/** @file CbmFieldMapData.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapData source file                -----
 // -----                V. Friese                14/02/06              -----
diff --git a/core/qa/CbmQaBaseLinkDef.h b/core/qa/CbmQaBaseLinkDef.h
index a97e83e971..f013bc70d2 100644
--- a/core/qa/CbmQaBaseLinkDef.h
+++ b/core/qa/CbmQaBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmQaBaseLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
index 9e237bb540..826d37d82c 100644
--- a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
+++ b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmBeamtimeCosy2019LinkDef.h
-  * @copyright Copyright (C) 2021 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx b/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
index 156d7586c8..01112696ee 100644
--- a/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
@@ -1,6 +1,3 @@
-/** @file CbmCosy2019ContFact.cxx
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /////////////////////////////////////////////////////////////
 //
 //  CbmCosy2019ContFact
diff --git a/fles/cosy2019/parameter/CbmCosy2019ContFact.h b/fles/cosy2019/parameter/CbmCosy2019ContFact.h
index d6ab3b46f4..a98a9f349a 100644
--- a/fles/cosy2019/parameter/CbmCosy2019ContFact.h
+++ b/fles/cosy2019/parameter/CbmCosy2019ContFact.h
@@ -1,8 +1,6 @@
-/** @file CbmCosy2019ContFact.h
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMCOSY2019CONTFACT_H
 #define CBMCOSY2019CONTFACT_H
+
 #include "FairContFact.h"
 
 class FairContainer;
diff --git a/fles/flestools/CbmFlesCanvasTools.cxx b/fles/flestools/CbmFlesCanvasTools.cxx
index e18516dfb5..50fb6e55a4 100644
--- a/fles/flestools/CbmFlesCanvasTools.cxx
+++ b/fles/flestools/CbmFlesCanvasTools.cxx
@@ -1,7 +1,5 @@
-/** @file CbmFlesCanvasTools.cxx
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmFlesCanvasTools.h"
+
 #include "TCanvas.h"
 #include "TH1.h"
 
diff --git a/fles/flestools/CbmFlesHistosTools.cxx b/fles/flestools/CbmFlesHistosTools.cxx
index d6ca549861..c61c8640d8 100644
--- a/fles/flestools/CbmFlesHistosTools.cxx
+++ b/fles/flestools/CbmFlesHistosTools.cxx
@@ -1,7 +1,5 @@
-/** @file CbmFlesHistosTools.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmFlesHistosTools.h"
+
 #include <cmath>
 //#include <vector>
 
diff --git a/fles/flestools/CbmFormatDecHexPrintout.cxx b/fles/flestools/CbmFormatDecHexPrintout.cxx
index ff73d29e87..4624eb19f6 100644
--- a/fles/flestools/CbmFormatDecHexPrintout.cxx
+++ b/fles/flestools/CbmFormatDecHexPrintout.cxx
@@ -1,7 +1,6 @@
-/** @file CbmFormatDecHexPrintout.cxx
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmFormatDecHexPrintout.h"
+
 std::string FormatDecPrintout(uint64_t ulVal, char cFill, uint uWidth)
 {
   std::stringstream ss;
diff --git a/fles/flestools/CbmFormatMsBufferPrintout.cxx b/fles/flestools/CbmFormatMsBufferPrintout.cxx
index 0d40a404ed..1a133b316e 100644
--- a/fles/flestools/CbmFormatMsBufferPrintout.cxx
+++ b/fles/flestools/CbmFormatMsBufferPrintout.cxx
@@ -1,7 +1,6 @@
-/** @file CbmFormatMsBufferPrintout.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmFormatMsBufferPrintout.h"
+
 std::string FormatMsBufferPrintout(const fles::Timeslice& ts, const size_t uMsCompIdx, const size_t uMsIdx,
                                    const uint32_t uBlocksPerLine)
 {
diff --git a/fles/flestools/CbmFormatMsHeaderPrintout.cxx b/fles/flestools/CbmFormatMsHeaderPrintout.cxx
index b5629ae2ba..eb8599cecb 100644
--- a/fles/flestools/CbmFormatMsHeaderPrintout.cxx
+++ b/fles/flestools/CbmFormatMsHeaderPrintout.cxx
@@ -1,7 +1,6 @@
-/** @file CbmFormatMsHeaderPrintout.cxx
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmFormatMsHeaderPrintout.h"
+
 std::string FormatMsHeaderPrintout(const fles::MicrosliceDescriptor& msDescriptor)
 {
   std::stringstream ss;
diff --git a/fles/flestools/CbmFormatTsPrintout.cxx b/fles/flestools/CbmFormatTsPrintout.cxx
index 90cff9c4f5..a9cb8151ed 100644
--- a/fles/flestools/CbmFormatTsPrintout.cxx
+++ b/fles/flestools/CbmFormatTsPrintout.cxx
@@ -1,6 +1,4 @@
-/** @file CbmFormatTsPrintout.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmFormatMsBufferPrintout.h"
 #include "CbmFormatMsHeaderPrintout.h"
 
diff --git a/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h b/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
index 288bf35e58..dcba547cbf 100644
--- a/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
+++ b/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index aae25ae223..9e8d7f78e5 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMcbm2018UnpackerAlgoRich.cxx
-  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * CbmMcbm2018UnpackerAlgoRich
  * E. Ovcharenko, Mar 2019
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
index 93b32a32fe..815cb04276 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
@@ -1,6 +1,3 @@
-/** @file CbmMcbm2018UnpackerAlgoRich.h
-  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * CbmMcbm2018UnpackerAlgoRich
  * E. Ovcharenko, Mar 2019
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
index 5baa0e10d7..695758732e 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMcbm2018UnpackerAlgoTrdR.cxx
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMcbm2018UnpackerAlgoTrdR.h"
+
 #include "CbmTrdAddress.h"
 #include "CbmTrdHardwareSetupR.h"
 #include "CbmTrdParModDigi.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
index e5cacafea7..85c8321b8f 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMcbm2018UnpackerTaskRich.cxx
-  * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * CbmMcbm2018UnpackerTaskRich
  * E. Ovcharenko, Mar 2019
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
index 4630f2e869..1fef6d2356 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
@@ -1,6 +1,3 @@
-/** @file CbmMcbm2018UnpackerTaskRich.h
-  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
  * CbmMcbm2018UnpackerTaskRich
  * E. Ovcharenko, Mar 2019
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
index 123ceb89bf..e3fc263a30 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMcbm2018UnpackerTaskTrdR.cxx
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMcbm2018UnpackerTaskTrdR.h"
+
 #include "CbmMcbm2018UnpackerAlgoTrdR.h"
 
 #include "FairRootManager.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx
index f7bbaab89c..5eda739f48 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMcbm2018UnpackerUtilRich.cxx
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMcbm2018UnpackerUtilRich.h"
+
 #include <iostream>
 
 std::string mRichSupport::GetBinaryRepresentation(size_t const size, uint8_t const* const ptr)
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h
index ae036e794f..0a6d1ff79b 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h
@@ -1,8 +1,6 @@
-/** @file CbmMcbm2018UnpackerUtilRich.h
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmMcbm2018UnpackerUtilRich_H
 #define CbmMcbm2018UnpackerUtilRich_H
+
 // STD
 #include <string>
 
diff --git a/fles/star2019/CbmFlibStar2019LinkDef.h b/fles/star2019/CbmFlibStar2019LinkDef.h
index 12e3df52df..50b720849d 100644
--- a/fles/star2019/CbmFlibStar2019LinkDef.h
+++ b/fles/star2019/CbmFlibStar2019LinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/fles/star2019/parameter/CbmStar2019ContFact.cxx b/fles/star2019/parameter/CbmStar2019ContFact.cxx
index 1969e86712..a814ef798f 100644
--- a/fles/star2019/parameter/CbmStar2019ContFact.cxx
+++ b/fles/star2019/parameter/CbmStar2019ContFact.cxx
@@ -1,6 +1,3 @@
-/** @file CbmStar2019ContFact.cxx
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /////////////////////////////////////////////////////////////
 //
 //  CbmStar2019ContFact
diff --git a/fles/star2019/parameter/CbmStar2019ContFact.h b/fles/star2019/parameter/CbmStar2019ContFact.h
index e9d4060960..b6e8f81214 100644
--- a/fles/star2019/parameter/CbmStar2019ContFact.h
+++ b/fles/star2019/parameter/CbmStar2019ContFact.h
@@ -1,8 +1,6 @@
-/** @file CbmStar2019ContFact.h
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMSTAR2019CONTFACT_H
 #define CBMSTAR2019CONTFACT_H
+
 #include "FairContFact.h"
 
 class FairContainer;
diff --git a/macro/KF/DecayConfig.C b/macro/KF/DecayConfig.C
index 0c2a810185..963b7faac6 100644
--- a/macro/KF/DecayConfig.C
+++ b/macro/KF/DecayConfig.C
@@ -1,8 +1,6 @@
-/** @file DecayConfig.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void DecayConfig()
 {
+
   KFPartEfficiencies eff;
 
   for (int iParticle = eff.GetParticleIndex(429); iParticle <= eff.GetParticleIndex(-429); iParticle++) {
diff --git a/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C b/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C
index 6bf0bda18d..d56e0b9a51 100644
--- a/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C
+++ b/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C
@@ -1,7 +1,5 @@
-/** @file CalculateEfficincy.C
-  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // #include "$VMCWORKDIR/KF/KFParticleParformance/KFPartEfficiencies.h"
+
 void CalculateEfficincy(TString workdir = "data")
 {
 
diff --git a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
index 18ea9912fe..dcd59f8aa5 100644
--- a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
+++ b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
@@ -1,8 +1,6 @@
-/** @file DrawParticlesFitQA.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void DrawParticlesFitQA(int iParticle = 0)
 {
+
   TStopwatch timer;
   timer.Start();
 
diff --git a/macro/KF/KFParticleFinderSignalTest/GetParticleName.C b/macro/KF/KFParticleFinderSignalTest/GetParticleName.C
index e010dd70f1..209fcabc2a 100644
--- a/macro/KF/KFParticleFinderSignalTest/GetParticleName.C
+++ b/macro/KF/KFParticleFinderSignalTest/GetParticleName.C
@@ -1,7 +1,5 @@
-/** @file GetParticleName.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // #include "$VMCWORKDIR/KF/KFParticleParformance/KFPartEfficiencies.h"
+
 void GetParticleName(int iParticle = 0)
 {
 
diff --git a/macro/KF/kf_kfparticle.C b/macro/KF/kf_kfparticle.C
index a9f031929a..9b1ed0f48e 100644
--- a/macro/KF/kf_kfparticle.C
+++ b/macro/KF/kf_kfparticle.C
@@ -1,6 +1,3 @@
-/** @file kf_kfparticle.C
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of short-lived particles with KF Particle Finder
diff --git a/macro/KF/registerGeantDecays.C b/macro/KF/registerGeantDecays.C
index 037375ddb4..a891503ad7 100644
--- a/macro/KF/registerGeantDecays.C
+++ b/macro/KF/registerGeantDecays.C
@@ -1,6 +1,3 @@
-/** @file registerGeantDecays.C
-  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void registerGeantDecays(int iDecay)
 {
   KFPartEfficiencies eff;
diff --git a/macro/KF/registerLightIons.C b/macro/KF/registerLightIons.C
index cf3bf30690..872a8ed04c 100644
--- a/macro/KF/registerLightIons.C
+++ b/macro/KF/registerLightIons.C
@@ -1,6 +1,3 @@
-/** @file registerLightIons.C
-  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void registerLightIons()
 {
   KFPartEfficiencies eff;
diff --git a/macro/KF/registerPythiaDecays.C b/macro/KF/registerPythiaDecays.C
index 4c48fc34c2..e0410c5f8e 100644
--- a/macro/KF/registerPythiaDecays.C
+++ b/macro/KF/registerPythiaDecays.C
@@ -1,6 +1,3 @@
-/** @file registerPythiaDecays.C
-  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void registerPythiaDecays(int iDecay)
 {
   KFPartEfficiencies eff;
diff --git a/macro/L1/perf.C b/macro/L1/perf.C
index b5a51dc267..3c3cbf3021 100644
--- a/macro/L1/perf.C
+++ b/macro/L1/perf.C
@@ -1,8 +1,6 @@
-/** @file perf.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void perf()
 {
+
   TStopwatch timer;
   timer.Start();
 
diff --git a/macro/L1/rec.C b/macro/L1/rec.C
index 3730313b9d..554ddbbb2a 100644
--- a/macro/L1/rec.C
+++ b/macro/L1/rec.C
@@ -1,8 +1,6 @@
-/** @file rec.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void rec()
 {
+
   TStopwatch timer;
   timer.Start();
 
diff --git a/macro/L1/sim.C b/macro/L1/sim.C
index 60f9fa3514..8c47959698 100644
--- a/macro/L1/sim.C
+++ b/macro/L1/sim.C
@@ -1,6 +1,3 @@
-/** @file sim.C
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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 f62e7d5f1e..5899d08642 100644
--- a/macro/L1/simD0.C
+++ b/macro/L1/simD0.C
@@ -1,6 +1,3 @@
-/** @file simD0.C
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro for running Cbm  with Geant3  or Geant4 (M. Al-Turany , D. Bertini)
 // Modified 22/06/2005 D.Bertini
 {
diff --git a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
index 8430a9e139..f417f90f57 100644
--- a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
+++ b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
@@ -1,6 +1,4 @@
-/** @file run_analysis_tree_maker.C
-  * @copyright Copyright (C) name="CpuLoad" CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setupName = "sis100_electron",
                              TString unigenFile = "")
 {
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 3eaa4e9be9..8da69888b0 100644
--- a/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C
+++ b/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C
@@ -1,6 +1,3 @@
-/** @file run_at_kfpf.C
-  * @copyright Copyright (C) 2020 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_at_kfpf(int nEntries = -1, const std::string& dataset = "test", const std::string& ATTree = "rTree")
 {
   ATKFParticleFinder man;
diff --git a/macro/analysis/common/cuts/cbm_cuts.h b/macro/analysis/common/cuts/cbm_cuts.h
index 9bde6eff79..043997f2ef 100644
--- a/macro/analysis/common/cuts/cbm_cuts.h
+++ b/macro/analysis/common/cuts/cbm_cuts.h
@@ -1,6 +1,4 @@
-/** @file cbm_cuts.h
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 AnalysisTree::Cuts* GetCbmEventCuts(const std::string& branch, std::string name = "CbmGoodEvent")
 {
   AnalysisTree::SimpleCut vtx_x_cut    = AnalysisTree::RangeCut(branch + ".vtx_x", -0.5, 0.5);
diff --git a/macro/analysis/common/qa/run_analysistree_qa.C b/macro/analysis/common/qa/run_analysistree_qa.C
index a3d26be768..c7ca0fe1a8 100644
--- a/macro/analysis/common/qa/run_analysistree_qa.C
+++ b/macro/analysis/common/qa/run_analysistree_qa.C
@@ -1,8 +1,6 @@
-/** @file run_analysistree_qa.C
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //#include <AnalysisTree/TaskManager.hpp>
 //#include "AnalysisTree/Cuts.hpp"
+
 //#include "src/EntryConfig.hpp"
 //#include "src/Task.hpp"
 //#include "src/Utils.hpp"
diff --git a/macro/analysis/conversion2/eventDisplay.C b/macro/analysis/conversion2/eventDisplay.C
index c92c1334d8..ec05ad9f96 100644
--- a/macro/analysis/conversion2/eventDisplay.C
+++ b/macro/analysis/conversion2/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///// 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.
 ///// If the option "store all hits" (in /gconfig/g3Config.C -> st->SetMinPoints(0);) is activated during the simulation, one will see also tracks (including light in RICH)
diff --git a/macro/analysis/conversion2/generator_input_file.C b/macro/analysis/conversion2/generator_input_file.C
index 05a453d41d..a828ef09fd 100644
--- a/macro/analysis/conversion2/generator_input_file.C
+++ b/macro/analysis/conversion2/generator_input_file.C
@@ -1,6 +1,3 @@
-/** @file generator_input_file.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///// 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 16a0ea1cbf..7b73bcb46d 100644
--- a/macro/analysis/conversion2/run_analysis.C
+++ b/macro/analysis/conversion2/run_analysis.C
@@ -1,6 +1,3 @@
-/** @file run_analysis.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated raw data
diff --git a/macro/analysis/conversion2/run_reco_event.C b/macro/analysis/conversion2/run_reco_event.C
index 4b080f9565..d0c64ef3a8 100644
--- a/macro/analysis/conversion2/run_reco_event.C
+++ b/macro/analysis/conversion2/run_reco_event.C
@@ -1,6 +1,3 @@
-/** @file run_reco_event.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated raw data
diff --git a/macro/analysis/dielectron/draw_analysis.C b/macro/analysis/dielectron/draw_analysis.C
index dec4ee9e5d..7d24194252 100644
--- a/macro/analysis/dielectron/draw_analysis.C
+++ b/macro/analysis/dielectron/draw_analysis.C
@@ -1,7 +1,5 @@
-/** @file draw_analysis.C
-  * @copyright Copyright (C) 2010-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //#include <experimental/filesystem>
+
 void draw_analysis(const string& histRootFile = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/analysis.all.root",
                    const string& resultDir    = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/histograms/inmed/",
                    Bool_t useMvd = false, Bool_t drawSignificance = true)
diff --git a/macro/analysis/dielectron/draw_analysis_all.C b/macro/analysis/dielectron/draw_analysis_all.C
index fe9601561c..e9f8b40354 100644
--- a/macro/analysis/dielectron/draw_analysis_all.C
+++ b/macro/analysis/dielectron/draw_analysis_all.C
@@ -1,6 +1,3 @@
-/** @file draw_analysis_all.C
-  * @copyright Copyright (C) 2011-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_analysis_all(
   const string& fileInmed  = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/analysis.all.root",
   const string& fileQgp    = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/qgp/analysis.all.root",
diff --git a/macro/analysis/dielectron/draw_analysis_study.C b/macro/analysis/dielectron/draw_analysis_study.C
index e279aafcbb..44390bdcc1 100644
--- a/macro/analysis/dielectron/draw_analysis_study.C
+++ b/macro/analysis/dielectron/draw_analysis_study.C
@@ -1,6 +1,3 @@
-/** @file draw_analysis_study.C
-  * @copyright Copyright (C) 2012-2013 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 using namespace std;
 void draw_analysis_study()
 {
diff --git a/macro/analysis/dielectron/draw_litqa.C b/macro/analysis/dielectron/draw_litqa.C
index 4bc055b938..5c5beef2c0 100644
--- a/macro/analysis/dielectron/draw_litqa.C
+++ b/macro/analysis/dielectron/draw_litqa.C
@@ -1,8 +1,6 @@
-/** @file draw_litqa.C
-  * @copyright Copyright (C) 2014-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/")
+
 {
   string outputDirTracking = resultDir + "results_litqa_tracking/";
   gSystem->mkdir(outputDirTracking.c_str(), true);
diff --git a/macro/analysis/dielectron/draw_mvd_xy_delta.C b/macro/analysis/dielectron/draw_mvd_xy_delta.C
index abb46e28a2..7c4699ba77 100644
--- a/macro/analysis/dielectron/draw_mvd_xy_delta.C
+++ b/macro/analysis/dielectron/draw_mvd_xy_delta.C
@@ -1,6 +1,3 @@
-/** @file draw_mvd_xy_delta.C
-  * @copyright Copyright (C) 2012 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_mvd_xy_delta()
 {
   TString fileName = "/lustre/cbm/user/ebelolap/aug11/25gev/70field/deltasource/mc.delta.root";
diff --git a/macro/analysis/dielectron/hadd.C b/macro/analysis/dielectron/hadd.C
index 8a0510e02e..d02364fc1c 100644
--- a/macro/analysis/dielectron/hadd.C
+++ b/macro/analysis/dielectron/hadd.C
@@ -1,7 +1,5 @@
-/** @file hadd.C
-  * @copyright Copyright (C) 2012-2018 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 using namespace std;
+
 void hadd(string pattern, string outputFile, int fileSizeLimit = 50000, int nofEvents = 1000)
 {
 
diff --git a/macro/analysis/dielectron/run_analysis.C b/macro/analysis/dielectron/run_analysis.C
index e370921c96..d8c7ce8f13 100644
--- a/macro/analysis/dielectron/run_analysis.C
+++ b/macro/analysis/dielectron/run_analysis.C
@@ -1,6 +1,3 @@
-/** @file run_analysis.C
-  * @copyright Copyright (C) 2010-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
                   const string& digiFile      = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/digi.1.root",
diff --git a/macro/analysis/dielectron/run_digi.C b/macro/analysis/dielectron/run_digi.C
index fa3a766828..a9ad718258 100644
--- a/macro/analysis/dielectron/run_digi.C
+++ b/macro/analysis/dielectron/run_digi.C
@@ -1,6 +1,3 @@
-/** @file run_digi.C
-  * @copyright Copyright (C) 2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
               const string& digiFile = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/digi.2.root",
diff --git a/macro/analysis/dielectron/run_litqa.C b/macro/analysis/dielectron/run_litqa.C
index bbd0724d45..8469069b90 100644
--- a/macro/analysis/dielectron/run_litqa.C
+++ b/macro/analysis/dielectron/run_litqa.C
@@ -1,6 +1,3 @@
-/** @file run_litqa.C
-  * @copyright Copyright (C) 2014-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
                const string& digiFile = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/digi.2.root",
diff --git a/macro/analysis/dielectron/run_reco.C b/macro/analysis/dielectron/run_reco.C
index ff3f7d0098..ee3e7fb5cc 100644
--- a/macro/analysis/dielectron/run_reco.C
+++ b/macro/analysis/dielectron/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2011-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
               const string& digiFile = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/digi.1.root",
diff --git a/macro/analysis/dielectron/run_sim.C b/macro/analysis/dielectron/run_sim.C
index 4752d13b10..8b7d9e7ba4 100644
--- a/macro/analysis/dielectron/run_sim.C
+++ b/macro/analysis/dielectron/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2011-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim(const string& urqmdFile = "/lustre/nyx/cbm/prod/gen/urqmd/auau/8gev/centr/"
                                        "urqmd.auau.8gev.centr.00001.root",  // if "", no urqmd
              const string& plutoFile =
diff --git a/macro/analysis/flow/MergeTTree.C b/macro/analysis/flow/MergeTTree.C
index 0d95328434..ae19e95461 100644
--- a/macro/analysis/flow/MergeTTree.C
+++ b/macro/analysis/flow/MergeTTree.C
@@ -1,6 +1,3 @@
-/** @file MergeTTree.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- This macro merges several files containing TTrees into one; from different input files:
 // ----- mode=0: files with reconstructed event planes (non-corrected if fQcorr = fBarcorr = 0, corrected otherwise) - produced by eventPlane.C
diff --git a/macro/analysis/flow/anaFlow.C b/macro/analysis/flow/anaFlow.C
index 30f7132dae..4a3b28e89c 100644
--- a/macro/analysis/flow/anaFlow.C
+++ b/macro/analysis/flow/anaFlow.C
@@ -1,6 +1,3 @@
-/** @file anaFlow.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- This task reconstructs the particle flow (vn, n = 1 & 2) out of measured particle azimuthal distributions (input: reco. files or KFParticle Finder output)
 // ----- Particle azimuthal distributions can be taken w.r.t. the true reaction plane (input: MC -transport output- file)
diff --git a/macro/analysis/flow/centrality_drawReso_STS_PSD.C b/macro/analysis/flow/centrality_drawReso_STS_PSD.C
index 1975c4a97d..6083dbe07c 100644
--- a/macro/analysis/flow/centrality_drawReso_STS_PSD.C
+++ b/macro/analysis/flow/centrality_drawReso_STS_PSD.C
@@ -1,8 +1,6 @@
-/** @file centrality_drawReso_STS_PSD.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- This task draws the centrality resolution versus collision centrality
+
 centrality_drawReso_STS_PSD()
 {
   // show c_STS for kPSD==0 -> biais for centrality, same for kPSD1vsSTS etc
diff --git a/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C b/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C
index 940d1bb3a4..24d26a1341 100644
--- a/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C
+++ b/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C
@@ -1,9 +1,7 @@
-/** @file centrality_evtbyevt_calculation_STS_PSD.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- This task calculate the collision centrality for each event, based on STS and PSD information
 
+
 void centrality_evtbyevt_calculation_STS_PSD()
 {
   TFile* f1 = new TFile("/hera/cbm/users/sseddiki/auau_TDR/shield/au2au/"
diff --git a/macro/analysis/flow/check_EPflattening_Qvector.C b/macro/analysis/flow/check_EPflattening_Qvector.C
index d025ae3239..0a143164e5 100644
--- a/macro/analysis/flow/check_EPflattening_Qvector.C
+++ b/macro/analysis/flow/check_EPflattening_Qvector.C
@@ -1,8 +1,6 @@
-/** @file check_EPflattening_Qvector.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- This task draws the average X-component of the Q-vector versus detector multiplicity - here for the PSD: <Qx> vs Energy
+
 void check_EPflattening_Qvector()
 {
   TFile* f1 = new TFile("/hera/cbm/users/sseddiki/auau_TDR/shield/au2au/"
diff --git a/macro/analysis/flow/eventPlane.C b/macro/analysis/flow/eventPlane.C
index 86f156d9ae..06f1c965b0 100644
--- a/macro/analysis/flow/eventPlane.C
+++ b/macro/analysis/flow/eventPlane.C
@@ -1,6 +1,3 @@
-/** @file eventPlane.C
-  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- This task calculates the event plane for each collision event from STS and PSD information (input: reco. files)
 // ----- It also provides comparision with real reaction plane (input: MC -transport output- files)
diff --git a/macro/analysis/flow/graph_RPreso_vsCentrality.C b/macro/analysis/flow/graph_RPreso_vsCentrality.C
index 32e5fa37c8..5daffb9449 100644
--- a/macro/analysis/flow/graph_RPreso_vsCentrality.C
+++ b/macro/analysis/flow/graph_RPreso_vsCentrality.C
@@ -1,8 +1,6 @@
-/** @file graph_RPreso_vsCentrality.C
-  * @copyright Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // ----- Macro to draw the reaction plane resolution versus % most centrality (based on STS multiplicity)
+
 graph_RP_cos_vsCentrality()
 {
   // files to CHANGE - here: 7 different energies
diff --git a/macro/analysis/flow/run_reco_flow.C b/macro/analysis/flow/run_reco_flow.C
index 74d3fa37a9..2f86437205 100644
--- a/macro/analysis/flow/run_reco_flow.C
+++ b/macro/analysis/flow/run_reco_flow.C
@@ -1,6 +1,3 @@
-/** @file run_reco_flow.C
-  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/analysis/flow/run_sim_flow.C b/macro/analysis/flow/run_sim_flow.C
index 4817c69efb..f0a438cf57 100644
--- a/macro/analysis/flow/run_sim_flow.C
+++ b/macro/analysis/flow/run_sim_flow.C
@@ -1,6 +1,3 @@
-/** @file run_sim_flow.C
-  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation for the sake of collective flow studies, using UrQMD or SHIELD input and GEANT4
diff --git a/macro/analysis/hyperons/ana_cascade.C b/macro/analysis/hyperons/ana_cascade.C
index 28f5b22e21..18ead9c0f4 100644
--- a/macro/analysis/hyperons/ana_cascade.C
+++ b/macro/analysis/hyperons/ana_cascade.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void ana_cascade(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3312)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/hyperons/ana_histo_la.C b/macro/analysis/hyperons/ana_histo_la.C
index 96cc243894..c2b851684b 100644
--- a/macro/analysis/hyperons/ana_histo_la.C
+++ b/macro/analysis/hyperons/ana_histo_la.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void ana_histo_la()
 {
   gROOT->LoadMacro("$VMCWORKDIR/analysis/hyperon/hyperon_style.C");
diff --git a/macro/analysis/hyperons/ana_histo_om.C b/macro/analysis/hyperons/ana_histo_om.C
index 552516d1fa..28c389c1b2 100644
--- a/macro/analysis/hyperons/ana_histo_om.C
+++ b/macro/analysis/hyperons/ana_histo_om.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void ana_histo_om()
 {
   gROOT->LoadMacro("$VMCWORKDIR/analysis/hyperon/hyperon_style.C");
diff --git a/macro/analysis/hyperons/ana_la.C b/macro/analysis/hyperons/ana_la.C
index 3b6b5aca8a..a0ad1ef1c0 100644
--- a/macro/analysis/hyperons/ana_la.C
+++ b/macro/analysis/hyperons/ana_la.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void ana_la(Int_t file_nr = 0, Int_t nEvents = 10)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/hyperons/create_histo_la.C b/macro/analysis/hyperons/create_histo_la.C
index d116236653..d70074844e 100644
--- a/macro/analysis/hyperons/create_histo_la.C
+++ b/macro/analysis/hyperons/create_histo_la.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void create_histo_la(Int_t file_nr = 0)
 {
   Int_t iVerbose     = 2;
diff --git a/macro/analysis/hyperons/create_histo_om.C b/macro/analysis/hyperons/create_histo_om.C
index dbb3b61ff2..da6a29b54d 100644
--- a/macro/analysis/hyperons/create_histo_om.C
+++ b/macro/analysis/hyperons/create_histo_om.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void create_histo_om(Int_t file_nr = 0)
 {
   Int_t iVerbose     = 2;
diff --git a/macro/analysis/hyperons/drawM.C b/macro/analysis/hyperons/drawM.C
index c79a5c28fd..d1d0d3d214 100644
--- a/macro/analysis/hyperons/drawM.C
+++ b/macro/analysis/hyperons/drawM.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void drawM()
 {
   gStyle->SetOptStat(0);
diff --git a/macro/analysis/hyperons/drawM_om.C b/macro/analysis/hyperons/drawM_om.C
index 10241c5333..5308df796e 100644
--- a/macro/analysis/hyperons/drawM_om.C
+++ b/macro/analysis/hyperons/drawM_om.C
@@ -1,6 +1,3 @@
-/** @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 **/
 drawM()
 {
   gStyle->SetOptStat(0);
diff --git a/macro/analysis/hyperons/eff.C b/macro/analysis/hyperons/eff.C
index ad049abb5c..e550e6121c 100644
--- a/macro/analysis/hyperons/eff.C
+++ b/macro/analysis/hyperons/eff.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void eff(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3122)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/hyperons/eff_draw.C b/macro/analysis/hyperons/eff_draw.C
index 54419a4706..39bbcd4471 100644
--- a/macro/analysis/hyperons/eff_draw.C
+++ b/macro/analysis/hyperons/eff_draw.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void eff_draw(char* fileName = "la.ef.root")
 {
   gROOT->LoadMacro("$VMCWORKDIR/analysis/hyperon/hyperon_style.C");
diff --git a/macro/analysis/hyperons/merge.C b/macro/analysis/hyperons/merge.C
index 6d2429c5f4..c69c6c543c 100644
--- a/macro/analysis/hyperons/merge.C
+++ b/macro/analysis/hyperons/merge.C
@@ -1,8 +1,6 @@
-/** @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 **/
 {
   Double_t scale = 1.388;  //Scale bgd with this factor
+
   TFile* f0 = new TFile("histo_bgd.root", "read");
 
   fhBgdB1B2      = new TH2D(*hBgdB1B2);
diff --git a/macro/analysis/hyperons/mix_cascade.C b/macro/analysis/hyperons/mix_cascade.C
index 923b6f6e77..a51819ff78 100644
--- a/macro/analysis/hyperons/mix_cascade.C
+++ b/macro/analysis/hyperons/mix_cascade.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void mix_cascade(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3312)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/hyperons/rec.C b/macro/analysis/hyperons/rec.C
index 8303564ed0..d190877150 100644
--- a/macro/analysis/hyperons/rec.C
+++ b/macro/analysis/hyperons/rec.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void rec(Int_t file_nr = 0, Int_t nEvents = 1, Int_t s = 0)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/hyperons/sela.C b/macro/analysis/hyperons/sela.C
index c53fa6b2de..32d5d63a53 100644
--- a/macro/analysis/hyperons/sela.C
+++ b/macro/analysis/hyperons/sela.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void sela(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3312)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/hyperons/sim.C b/macro/analysis/hyperons/sim.C
index 77829b5091..569e703221 100644
--- a/macro/analysis/hyperons/sim.C
+++ b/macro/analysis/hyperons/sim.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void sim(Int_t file_nr = 0, Int_t nEvents = 1, Int_t s = 0, Int_t seed = 1)
 {
   Char_t filenr[4];
diff --git a/macro/analysis/jpsi/DecayConfig.C b/macro/analysis/jpsi/DecayConfig.C
index c14e028470..5cf7cc241f 100644
--- a/macro/analysis/jpsi/DecayConfig.C
+++ b/macro/analysis/jpsi/DecayConfig.C
@@ -1,8 +1,6 @@
-/** @file DecayConfig.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void DecayConfig()
 {
+
   // This script uses the external decayer TPythia6Decayer in place of the
   // concrete Monte Carlo native decay mechanisms only for the
   // specific types of decays defined below.
diff --git a/macro/analysis/jpsi/run_sim.C b/macro/analysis/jpsi/run_sim.C
index 2b53942d38..0194e25544 100644
--- a/macro/analysis/jpsi/run_sim.C
+++ b/macro/analysis/jpsi/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/analysis/jpsiana/draw_analysis_jpsi.C b/macro/analysis/jpsiana/draw_analysis_jpsi.C
index d138fe2a97..4f991aa3d1 100644
--- a/macro/analysis/jpsiana/draw_analysis_jpsi.C
+++ b/macro/analysis/jpsiana/draw_analysis_jpsi.C
@@ -1,6 +1,4 @@
-/** @file draw_analysis_jpsi.C
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void draw_analysis_jpsi()
 {
   TStopwatch timer;
diff --git a/macro/analysis/jpsiana/draw_litqa.C b/macro/analysis/jpsiana/draw_litqa.C
index c78e229b68..6384460e58 100644
--- a/macro/analysis/jpsiana/draw_litqa.C
+++ b/macro/analysis/jpsiana/draw_litqa.C
@@ -1,6 +1,3 @@
-/** @file draw_litqa.C
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_litqa()
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
diff --git a/macro/analysis/jpsiana/draw_superevent_jpsi.C b/macro/analysis/jpsiana/draw_superevent_jpsi.C
index 8a2516c397..adcb91c888 100644
--- a/macro/analysis/jpsiana/draw_superevent_jpsi.C
+++ b/macro/analysis/jpsiana/draw_superevent_jpsi.C
@@ -1,6 +1,4 @@
-/** @file draw_superevent_jpsi.C
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void draw_superevent_jpsi()
 {
   TStopwatch timer;
diff --git a/macro/analysis/jpsiana/hadd.C b/macro/analysis/jpsiana/hadd.C
index 3d3ce0f02e..0643ffa470 100644
--- a/macro/analysis/jpsiana/hadd.C
+++ b/macro/analysis/jpsiana/hadd.C
@@ -1,7 +1,5 @@
-/** @file hadd.C
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 using namespace std;
+
 void hadd()
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
diff --git a/macro/analysis/jpsiana/run_analysis_jpsi.C b/macro/analysis/jpsiana/run_analysis_jpsi.C
index dbc947edff..be8657140d 100644
--- a/macro/analysis/jpsiana/run_analysis_jpsi.C
+++ b/macro/analysis/jpsiana/run_analysis_jpsi.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_jpsi.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_analysis_jpsi(Int_t nEvents = 1000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/analysis/jpsiana/run_litqa_jpsi.C b/macro/analysis/jpsiana/run_litqa_jpsi.C
index 5c15decb10..6204081ab8 100644
--- a/macro/analysis/jpsiana/run_litqa_jpsi.C
+++ b/macro/analysis/jpsiana/run_litqa_jpsi.C
@@ -1,6 +1,3 @@
-/** @file run_litqa_jpsi.C
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_litqa_jpsi(Int_t nEvents = 1000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/analysis/jpsiana/run_reco_jpsi.C b/macro/analysis/jpsiana/run_reco_jpsi.C
index c5047180d9..352d6813b8 100644
--- a/macro/analysis/jpsiana/run_reco_jpsi.C
+++ b/macro/analysis/jpsiana/run_reco_jpsi.C
@@ -1,6 +1,3 @@
-/** @file run_reco_jpsi.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_jpsi(Int_t nEvents = 50)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/analysis/jpsiana/run_sim_jpsi.C b/macro/analysis/jpsiana/run_sim_jpsi.C
index 0ea6aba650..55b7822eff 100644
--- a/macro/analysis/jpsiana/run_sim_jpsi.C
+++ b/macro/analysis/jpsiana/run_sim_jpsi.C
@@ -1,6 +1,3 @@
-/** @file run_sim_jpsi.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim_jpsi(Int_t nEvents = 10)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/analysis/jpsiana/run_superevent_jpsi.C b/macro/analysis/jpsiana/run_superevent_jpsi.C
index f63e8f952f..9575eb9235 100644
--- a/macro/analysis/jpsiana/run_superevent_jpsi.C
+++ b/macro/analysis/jpsiana/run_superevent_jpsi.C
@@ -1,7 +1,5 @@
-/** @file run_superevent_jpsi.C
-  * @copyright Copyright (C) 2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "Riostream.h"
+
 void run_superevent_jpsi()
 {
   TStopwatch timer;
diff --git a/macro/analysis/much/ANN.C b/macro/analysis/much/ANN.C
index 09f86e46a8..d8095ae114 100644
--- a/macro/analysis/much/ANN.C
+++ b/macro/analysis/much/ANN.C
@@ -1,6 +1,3 @@
-/** @file ANN.C
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //---------------------------------------------------
 //
 // ANN training of muon track candidates
diff --git a/macro/analysis/much/Add_histo.C b/macro/analysis/much/Add_histo.C
index 50fa03eaac..4c3cf0be64 100644
--- a/macro/analysis/much/Add_histo.C
+++ b/macro/analysis/much/Add_histo.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // combine invariant mass spectra for background @ 8-10 A GeV/c
diff --git a/macro/analysis/much/Correction.C b/macro/analysis/much/Correction.C
index b97663eb91..1552bb166c 100644
--- a/macro/analysis/much/Correction.C
+++ b/macro/analysis/much/Correction.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // Example of efficiency correction procedure for omega meson
diff --git a/macro/analysis/much/InvariantMassSpectra.C b/macro/analysis/much/InvariantMassSpectra.C
index 4ad8d016c5..f80649fc9d 100644
--- a/macro/analysis/much/InvariantMassSpectra.C
+++ b/macro/analysis/much/InvariantMassSpectra.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // invariant mass spectra for low-mass vector mesons, J/psi and thermal muons @ 8-10 A GeV/c
diff --git a/macro/analysis/much/InvariantMassSpectra_SE.C b/macro/analysis/much/InvariantMassSpectra_SE.C
index 20c3039dde..c7cdb70432 100644
--- a/macro/analysis/much/InvariantMassSpectra_SE.C
+++ b/macro/analysis/much/InvariantMassSpectra_SE.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // invariant mass spectra for background
diff --git a/macro/analysis/much/InvariantMassSpectra_mix.C b/macro/analysis/much/InvariantMassSpectra_mix.C
index 6e7c9f3405..3433d06695 100644
--- a/macro/analysis/much/InvariantMassSpectra_mix.C
+++ b/macro/analysis/much/InvariantMassSpectra_mix.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // invariant mass spectra for background
diff --git a/macro/analysis/much/Optimization.C b/macro/analysis/much/Optimization.C
index 545bbf0fdf..5a820b9c20 100644
--- a/macro/analysis/much/Optimization.C
+++ b/macro/analysis/much/Optimization.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // invariant mass spectra for omega mesons @ 8-10 A GeV/c
diff --git a/macro/analysis/much/Pluto_analysis.C b/macro/analysis/much/Pluto_analysis.C
index 9d5a15de25..535a3999a1 100644
--- a/macro/analysis/much/Pluto_analysis.C
+++ b/macro/analysis/much/Pluto_analysis.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // PLUTO parameters of low-mass vector mesons and thermal muons @ 8 A GeV/c
diff --git a/macro/analysis/much/TrackParameters.C b/macro/analysis/much/TrackParameters.C
index 7a61429768..1aa0ed842c 100644
--- a/macro/analysis/much/TrackParameters.C
+++ b/macro/analysis/much/TrackParameters.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // parameters of muon track candidates
diff --git a/macro/analysis/much/generate_DrellYan_8GeV.C b/macro/analysis/much/generate_DrellYan_8GeV.C
index 7cfb4f6feb..0806859b70 100644
--- a/macro/analysis/much/generate_DrellYan_8GeV.C
+++ b/macro/analysis/much/generate_DrellYan_8GeV.C
@@ -1,8 +1,6 @@
-/** @file generate_DrellYan_8GeV.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /*
 MC code for generation of Drell-Yan dimuons and their decay into single muons
+
 Di-muons are generated randomy following paramtrized mass & rapidity distributions, exponential mT distribution
 
 Decay is performed following anisotropic angular distributions
diff --git a/macro/analysis/opencharm/CharmSetup.C b/macro/analysis/opencharm/CharmSetup.C
index 8921d52fc7..8bef89c313 100644
--- a/macro/analysis/opencharm/CharmSetup.C
+++ b/macro/analysis/opencharm/CharmSetup.C
@@ -1,6 +1,3 @@
-/** @file CharmSetup.C
-  * @copyright Copyright (C) 2015-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void CharmSetup()
 {
   // Input Parameter
diff --git a/macro/analysis/opencharm/HistogramProduction.C b/macro/analysis/opencharm/HistogramProduction.C
index 968c4db588..fe94b0b029 100644
--- a/macro/analysis/opencharm/HistogramProduction.C
+++ b/macro/analysis/opencharm/HistogramProduction.C
@@ -1,6 +1,4 @@
-/** @file HistogramProduction.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/analysis/opencharm/PairSelection.C b/macro/analysis/opencharm/PairSelection.C
index 5b0f0ddfaa..c562f7a131 100644
--- a/macro/analysis/opencharm/PairSelection.C
+++ b/macro/analysis/opencharm/PairSelection.C
@@ -1,6 +1,4 @@
-/** @file PairSelection.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/analysis/opencharm/PairSelectionSE.C b/macro/analysis/opencharm/PairSelectionSE.C
index f227f9ff5a..e589843319 100644
--- a/macro/analysis/opencharm/PairSelectionSE.C
+++ b/macro/analysis/opencharm/PairSelectionSE.C
@@ -1,6 +1,4 @@
-/** @file PairSelectionSE.C
-  * @copyright Copyright (C) 2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/analysis/opencharm/TrackSelection.C b/macro/analysis/opencharm/TrackSelection.C
index 30e81eda44..80cb10846c 100644
--- a/macro/analysis/opencharm/TrackSelection.C
+++ b/macro/analysis/opencharm/TrackSelection.C
@@ -1,6 +1,4 @@
-/** @file TrackSelection.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/analysis/opencharm/opencharm_delta.C b/macro/analysis/opencharm/opencharm_delta.C
index 91c13c32dc..5e046503a8 100644
--- a/macro/analysis/opencharm/opencharm_delta.C
+++ b/macro/analysis/opencharm/opencharm_delta.C
@@ -1,6 +1,3 @@
-/** @file opencharm_delta.C
-  * @copyright Copyright (C) 2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input with Pluto signal
diff --git a/macro/analysis/opencharm/opencharm_reco.C b/macro/analysis/opencharm/opencharm_reco.C
index fa258ffb7a..f8450ad764 100644
--- a/macro/analysis/opencharm/opencharm_reco.C
+++ b/macro/analysis/opencharm/opencharm_reco.C
@@ -1,6 +1,3 @@
-/** @file opencharm_reco.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/analysis/opencharm/opencharm_sim.C b/macro/analysis/opencharm/opencharm_sim.C
index 54a5b2b018..4f5f45ea4d 100644
--- a/macro/analysis/opencharm/opencharm_sim.C
+++ b/macro/analysis/opencharm/opencharm_sim.C
@@ -1,6 +1,3 @@
-/** @file opencharm_sim.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input with Pluto signal
diff --git a/macro/analysis/papa/run_analysis.C b/macro/analysis/papa/run_analysis.C
index 7a05461845..67a6554965 100644
--- a/macro/analysis/papa/run_analysis.C
+++ b/macro/analysis/papa/run_analysis.C
@@ -1,6 +1,3 @@
-/** @file run_analysis.C
-  * @copyright Copyright (C) 2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //R__ADD_INCLUDE_PATH(/lustre/nyx/cbm/users/ebechtel/analysis)
 R__ADD_INCLUDE_PATH($PWD)
 #include "Config_dilepton_testing.C"
diff --git a/macro/beamtime/camera_restore.C b/macro/beamtime/camera_restore.C
index 0d77d4f476..02a95f6167 100644
--- a/macro/beamtime/camera_restore.C
+++ b/macro/beamtime/camera_restore.C
@@ -1,6 +1,3 @@
-/** @file camera_restore.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /*
 void camera_restore(const char* fname, int mode = 0)
 {
diff --git a/macro/beamtime/cern2016/MuchCreateMap.C b/macro/beamtime/cern2016/MuchCreateMap.C
index 09ed04a236..7193181deb 100644
--- a/macro/beamtime/cern2016/MuchCreateMap.C
+++ b/macro/beamtime/cern2016/MuchCreateMap.C
@@ -1,6 +1,4 @@
-/** @file MuchCreateMap.C
-  * @copyright Copyright (C) 2016 Variable Energy Cyclotron Centre, Kolkata
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "/home/pmd/daqsoft/cbmroot_trunk/beamtime/MuchRealSize.h"
 void MuchCreateMap()
 {
diff --git a/macro/beamtime/cern2016/ana_digi.C b/macro/beamtime/cern2016/ana_digi.C
index 6185d5b91b..7da69e23fb 100644
--- a/macro/beamtime/cern2016/ana_digi.C
+++ b/macro/beamtime/cern2016/ana_digi.C
@@ -1,6 +1,3 @@
-/** @file ana_digi.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Double_t dDeadtime = 50.)
diff --git a/macro/beamtime/cern2016/ana_digi_cal.C b/macro/beamtime/cern2016/ana_digi_cal.C
index 57f6695ea3..89dbea7ceb 100644
--- a/macro/beamtime/cern2016/ana_digi_cal.C
+++ b/macro/beamtime/cern2016/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 34f777ab17..5a383d0fa8 100644
--- a/macro/beamtime/cern2016/dis_digi.C
+++ b/macro/beamtime/cern2016/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Double_t dDeadtime = 50., Int_t iGenCor = 1, Int_t iTrackingSetup = 0, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/cern2016/dis_hits.C b/macro/beamtime/cern2016/dis_hits.C
index 52bd7a049c..dc2b2e659a 100644
--- a/macro/beamtime/cern2016/dis_hits.C
+++ b/macro/beamtime/cern2016/dis_hits.C
@@ -1,6 +1,3 @@
-/** @file dis_hits.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/rootlogon.C b/macro/beamtime/cern2016/rootlogon.C
index 6a512d3136..2e83601bfe 100644
--- a/macro/beamtime/cern2016/rootlogon.C
+++ b/macro/beamtime/cern2016/rootlogon.C
@@ -1,8 +1,6 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
 }
+
 void rootlogon_nh()
 {
   cout << " Executing rootlogon.C (nh)" << endl;
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C
index d1635f8dc1..a0622d197a 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C
@@ -1,6 +1,3 @@
-/** @file AnalyseTimeCoincidenceBugAllCases2elinks.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
   outf->cd();
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C
index 32aee5df3b..7c9584059d 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C
@@ -1,6 +1,3 @@
-/** @file AnalyseTimeCoincidenceBugAllCases5elinks.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
   outf->cd();
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C
index be79ab8d51..efaf3f0089 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C
@@ -1,6 +1,3 @@
-/** @file AnalyseTimeCoincidenceBugAllCasesMoreCond.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
   outf->cd();
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C
index c61cdd9ad9..16a1f30027 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C
@@ -1,6 +1,3 @@
-/** @file AnalyseTimeCoincidenceBugLimits.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
   outf->cd();
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C
index a49a70b15e..2eb0ee4592 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C
@@ -1,6 +1,3 @@
-/** @file AnalyseTimeCoincidenceBugLimits2elinks.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
   outf->cd();
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C
index ef1efed78b..e773946789 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C
@@ -1,6 +1,3 @@
-/** @file AnalyseTimeCoincidenceBugLimits5elinks.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
   outf->cd();
diff --git a/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C b/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C
index 875547ee47..c52d7adbb0 100644
--- a/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C
+++ b/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C
@@ -1,6 +1,3 @@
-/** @file DtPeakPosSummaryCosy2018.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 Bool_t DtPeakPosSummaryCosy2018(TString sPath = "./data", Double_t dFitRange = 200)
 {
   static const UInt_t uNbRuns = 89;
diff --git a/macro/beamtime/cosy2018/DtStackS1.C b/macro/beamtime/cosy2018/DtStackS1.C
index 4cccf30066..b414aa8901 100644
--- a/macro/beamtime/cosy2018/DtStackS1.C
+++ b/macro/beamtime/cosy2018/DtStackS1.C
@@ -1,6 +1,4 @@
-/** @file DtStackS1.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void DtStackS1()
 {
   TFile* _file0 = TFile::Open("data/EfficiencyHistos.root");
diff --git a/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C b/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C
index c9971fe2e3..b2d0a3fe7e 100644
--- a/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C
+++ b/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C
@@ -1,6 +1,3 @@
-/** @file DupliHitsSummaryCosy2018.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 Bool_t DupliHitsSummaryCosy2018()
 {
   UInt_t uNbRuns = 89;
diff --git a/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C b/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C
index b105b107dc..9f73912b23 100644
--- a/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C
+++ b/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C
@@ -1,6 +1,3 @@
-/** @file EfficiencySummaryCosy2018.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 Bool_t EfficiencySummaryCosy2018(TString sPath = "./data")
 {
   UInt_t uNbRuns = 89;
diff --git a/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C b/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C
index dec793f391..80d3e36eaa 100644
--- a/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C
+++ b/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C
@@ -1,6 +1,3 @@
-/** @file ResidualsPeakPosCosy2018.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 Bool_t ResidualsPeakPosCosy2018(TString sPath = "./data", Double_t dFitRange = 3)
 {
   UInt_t uNbRuns = 89;
diff --git a/macro/beamtime/cosy2018/plotCosyHistos.C b/macro/beamtime/cosy2018/plotCosyHistos.C
index 14e338aed8..ec33e41717 100644
--- a/macro/beamtime/cosy2018/plotCosyHistos.C
+++ b/macro/beamtime/cosy2018/plotCosyHistos.C
@@ -1,6 +1,4 @@
-/** @file plotCosyHistos.C
-  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void plotCosyHistos()
 {
   /// Efficiency without corrections
diff --git a/macro/beamtime/cosy2019/FindHodoOrCoinc.C b/macro/beamtime/cosy2019/FindHodoOrCoinc.C
index 9f73dd3881..d5127316a0 100644
--- a/macro/beamtime/cosy2019/FindHodoOrCoinc.C
+++ b/macro/beamtime/cosy2019/FindHodoOrCoinc.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 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 c26dfbf6d3..f295faf73c 100644
--- a/macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C
+++ b/macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 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,
                                     TString sInputFileName     = "data/unp_cosy",
diff --git a/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C b/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C
index 1f23873340..715908cf2e 100644
--- a/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C
+++ b/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 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,
                                  TString sInputFileName = "data/unp_cosy")
diff --git a/macro/beamtime/cosy2019/FindNoisyChanSts.C b/macro/beamtime/cosy2019/FindNoisyChanSts.C
index 31663c2387..f5588d2ecf 100644
--- a/macro/beamtime/cosy2019/FindNoisyChanSts.C
+++ b/macro/beamtime/cosy2019/FindNoisyChanSts.C
@@ -1,6 +1,5 @@
-/** @file FindNoisyChanSts.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 Bool_t FindNoisyChanSts(TString sFilename, Double_t dNoiseThr = 60e3, UInt_t fuTotalNrOfFebs = 2)
 {
   const UInt_t kuNbChanPerFeb   = 1024;
diff --git a/macro/beamtime/cosy2019/FindOffsetsCosy2019.C b/macro/beamtime/cosy2019/FindOffsetsCosy2019.C
index 03df86d49a..1576b39fc6 100644
--- a/macro/beamtime/cosy2019/FindOffsetsCosy2019.C
+++ b/macro/beamtime/cosy2019/FindOffsetsCosy2019.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 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/PlotClusterCharge.C b/macro/beamtime/cosy2019/PlotClusterCharge.C
index f8a43bae29..07964aa5b9 100644
--- a/macro/beamtime/cosy2019/PlotClusterCharge.C
+++ b/macro/beamtime/cosy2019/PlotClusterCharge.C
@@ -1,6 +1,4 @@
-/** @file PlotClusterCharge.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t PlotClusterCharge(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 12)
 {
   /// Data Input
diff --git a/macro/beamtime/cosy2019/PlotCoinc.C b/macro/beamtime/cosy2019/PlotCoinc.C
index 819f785644..401a75c991 100644
--- a/macro/beamtime/cosy2019/PlotCoinc.C
+++ b/macro/beamtime/cosy2019/PlotCoinc.C
@@ -1,6 +1,4 @@
-/** @file PlotCoinc.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void PlotCoinc(TString sFilename, Int_t iNbTs = -1, Double_t dOffsetX = 0.0, Double_t dOffsetY = 0.0)
 {
   Double_t dPosZHodoA = 50.0;
diff --git a/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C b/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C
index 3f4c8e3bc3..a04116492d 100644
--- a/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C
+++ b/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C
@@ -1,6 +1,4 @@
-/** @file PlotStsPosWithHodoCoinc.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 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 38387cc988..a5fddbb04a 100644
--- a/macro/beamtime/cosy2019/check_coinc_Hodo.C
+++ b/macro/beamtime/cosy2019/check_coinc_Hodo.C
@@ -1,6 +1,3 @@
-/** @file check_coinc_Hodo.C
-  * @copyright Copyright (C) 2021 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void check_coinc_Hodo(Int_t nEvents = 10, UInt_t run = 25, UInt_t prefix = 0)
 {
   TString runId    = TString::Format("%04u", run);
diff --git a/macro/beamtime/cosy2019/cosy2019_calib.C b/macro/beamtime/cosy2019/cosy2019_calib.C
index 475aa24439..99f4969043 100644
--- a/macro/beamtime/cosy2019/cosy2019_calib.C
+++ b/macro/beamtime/cosy2019/cosy2019_calib.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2019)
diff --git a/macro/beamtime/cosy2019/cosy2019_process.C b/macro/beamtime/cosy2019/cosy2019_process.C
index c803f77090..b0e025f57b 100644
--- a/macro/beamtime/cosy2019/cosy2019_process.C
+++ b/macro/beamtime/cosy2019/cosy2019_process.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of cosy real data (2019)
diff --git a/macro/beamtime/cosy2019/cosy2019_reco.C b/macro/beamtime/cosy2019/cosy2019_reco.C
index 1c04a63cf1..e237b4bf88 100644
--- a/macro/beamtime/cosy2019/cosy2019_reco.C
+++ b/macro/beamtime/cosy2019/cosy2019_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of cosy simulated data (2019)
diff --git a/macro/beamtime/fit_yPos.C b/macro/beamtime/fit_yPos.C
index 30a7cedce7..a13af725ce 100644
--- a/macro/beamtime/fit_yPos.C
+++ b/macro/beamtime/fit_yPos.C
@@ -1,6 +1,3 @@
-/** @file fit_yPos.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void fit_yPos(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0, Double_t dLini = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/fit_ybox.C b/macro/beamtime/fit_ybox.C
index 2ae2843fe2..13f2910d2a 100644
--- a/macro/beamtime/fit_ybox.C
+++ b/macro/beamtime/fit_ybox.C
@@ -1,6 +1,3 @@
-/** @file fit_ybox.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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 4327f0fa90..adb62a6722 100644
--- a/macro/beamtime/fit_ybox.h
+++ b/macro/beamtime/fit_ybox.h
@@ -1,6 +1,3 @@
-/** @file fit_ybox.h
-  * @copyright Copyright (C) 2016-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // box with polynomial filling
 Double_t f1_xboxe(double* x, double* par)
 {
diff --git a/macro/beamtime/hd2017/PlotLongRangeDate.C b/macro/beamtime/hd2017/PlotLongRangeDate.C
index a8964dd5ea..bd7c62ca55 100644
--- a/macro/beamtime/hd2017/PlotLongRangeDate.C
+++ b/macro/beamtime/hd2017/PlotLongRangeDate.C
@@ -1,6 +1,4 @@
-/** @file PlotLongRangeDate.C
-  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 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,
                          UInt_t uNbFeeGdpb = 3)
diff --git a/macro/beamtime/hd2017/ana_digi.C b/macro/beamtime/hd2017/ana_digi.C
index 11194470eb..7da69e23fb 100644
--- a/macro/beamtime/hd2017/ana_digi.C
+++ b/macro/beamtime/hd2017/ana_digi.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
               Double_t dDeadtime = 50.)
diff --git a/macro/beamtime/hd2017/ana_digi_cal.C b/macro/beamtime/hd2017/ana_digi_cal.C
index d3e3462d56..9f30656303 100644
--- a/macro/beamtime/hd2017/ana_digi_cal.C
+++ b/macro/beamtime/hd2017/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 80d1fc31db..2e83601bfe 100644
--- a/macro/beamtime/hd2017/rootlogon.C
+++ b/macro/beamtime/hd2017/rootlogon.C
@@ -1,8 +1,6 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
 }
+
 void rootlogon_nh()
 {
   cout << " Executing rootlogon.C (nh)" << endl;
diff --git a/macro/beamtime/hd2020/ana_digi_cal.C b/macro/beamtime/hd2020/ana_digi_cal.C
index 9674a90e8a..6e862bb5ed 100644
--- a/macro/beamtime/hd2020/ana_digi_cal.C
+++ b/macro/beamtime/hd2020/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                   Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/hd2020/ana_trks.C b/macro/beamtime/hd2020/ana_trks.C
index 10851fc8dc..5cb2f7138f 100644
--- a/macro/beamtime/hd2020/ana_trks.C
+++ b/macro/beamtime/hd2020/ana_trks.C
@@ -1,6 +1,3 @@
-/** @file ana_trks.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Int_t iTrackingSetup = 1, Double_t dScalFac = 1., Double_t dChi2Lim2 = 50., Double_t dDeadtime = 50,
diff --git a/macro/beamtime/hd2020/dis_digi.C b/macro/beamtime/hd2020/dis_digi.C
index 6d22612dfe..e047e1e794 100644
--- a/macro/beamtime/hd2020/dis_digi.C
+++ b/macro/beamtime/hd2020/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Double_t dDeadtime = 50, Int_t iGenCor = 1, Int_t iTrackingSetup = 1, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/hd2020/dis_trks.C b/macro/beamtime/hd2020/dis_trks.C
index 75c79a3634..8678217846 100644
--- a/macro/beamtime/hd2020/dis_trks.C
+++ b/macro/beamtime/hd2020/dis_trks.C
@@ -1,6 +1,3 @@
-/** @file dis_trks.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/hd2020/pl_all_2D.C b/macro/beamtime/hd2020/pl_all_2D.C
index cd6e62325a..0d79c2fbf9 100644
--- a/macro/beamtime/hd2020/pl_all_2D.C
+++ b/macro/beamtime/hd2020/pl_all_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_2D.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_3D.C b/macro/beamtime/hd2020/pl_all_3D.C
index 3e1f1f1a39..2dd6e2a8f7 100644
--- a/macro/beamtime/hd2020/pl_all_3D.C
+++ b/macro/beamtime/hd2020/pl_all_3D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_3D.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_3D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iNSt = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_CluMul.C b/macro/beamtime/hd2020/pl_all_CluMul.C
index 8081bfc5e7..e45ed3e811 100644
--- a/macro/beamtime/hd2020/pl_all_CluMul.C
+++ b/macro/beamtime/hd2020/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNSt = 2, Double_t MulMax = 100)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_CluPosEvol.C b/macro/beamtime/hd2020/pl_all_CluPosEvol.C
index 6f7fb584ba..e4a51645ff 100644
--- a/macro/beamtime/hd2020/pl_all_CluPosEvol.C
+++ b/macro/beamtime/hd2020/pl_all_CluPosEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluPosEvol.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_CluRate.C b/macro/beamtime/hd2020/pl_all_CluRate.C
index 518284b951..99b7d8b1e7 100644
--- a/macro/beamtime/hd2020/pl_all_CluRate.C
+++ b/macro/beamtime/hd2020/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluRate.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluRate(Int_t iNSt = 2, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_CluTimeEvol.C b/macro/beamtime/hd2020/pl_all_CluTimeEvol.C
index 6ad26716a0..299124bc48 100644
--- a/macro/beamtime/hd2020/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/hd2020/pl_all_CluTimeEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluTimeEvol.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluTimeEvol(Int_t iNSt = 3, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_DTLastHits.C b/macro/beamtime/hd2020/pl_all_DTLastHits.C
index 91ebfae0ed..bae663ee28 100644
--- a/macro/beamtime/hd2020/pl_all_DTLastHits.C
+++ b/macro/beamtime/hd2020/pl_all_DTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DTLastHits.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_DigiCor.C b/macro/beamtime/hd2020/pl_all_DigiCor.C
index 759d9968ca..b7adc61da2 100644
--- a/macro/beamtime/hd2020/pl_all_DigiCor.C
+++ b/macro/beamtime/hd2020/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_DigiDTLD.C b/macro/beamtime/hd2020/pl_all_DigiDTLD.C
index 21b49f2162..35064e26af 100644
--- a/macro/beamtime/hd2020/pl_all_DigiDTLD.C
+++ b/macro/beamtime/hd2020/pl_all_DigiDTLD.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiDTLD.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiDTLD(Int_t iNDet = 6, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_DigiMul.C b/macro/beamtime/hd2020/pl_all_DigiMul.C
index eb55187365..f6c8bb8311 100644
--- a/macro/beamtime/hd2020/pl_all_DigiMul.C
+++ b/macro/beamtime/hd2020/pl_all_DigiMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiMul.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiMul(Int_t iNDet = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_DigiStatus.C b/macro/beamtime/hd2020/pl_all_DigiStatus.C
index e44e494db5..184f459dee 100644
--- a/macro/beamtime/hd2020/pl_all_DigiStatus.C
+++ b/macro/beamtime/hd2020/pl_all_DigiStatus.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiStatus.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiStatus(Int_t iNDet = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_DigiTot.C b/macro/beamtime/hd2020/pl_all_DigiTot.C
index 5e8b5aeee7..f7479893ef 100644
--- a/macro/beamtime/hd2020/pl_all_DigiTot.C
+++ b/macro/beamtime/hd2020/pl_all_DigiTot.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiTot.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiTot(Int_t iNDet = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_Sel2D.C b/macro/beamtime/hd2020/pl_all_Sel2D.C
index 6990f07a1f..a25447c591 100644
--- a/macro/beamtime/hd2020/pl_all_Sel2D.C
+++ b/macro/beamtime/hd2020/pl_all_Sel2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Sel2D.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_all_Track2D.C b/macro/beamtime/hd2020/pl_all_Track2D.C
index 0105ca3082..5c6c3db8c6 100644
--- a/macro/beamtime/hd2020/pl_all_Track2D.C
+++ b/macro/beamtime/hd2020/pl_all_Track2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Track2D.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/hd2020/pl_cmp_CluRate.C b/macro/beamtime/hd2020/pl_cmp_CluRate.C
index a537dcf58a..06e244d333 100644
--- a/macro/beamtime/hd2020/pl_cmp_CluRate.C
+++ b/macro/beamtime/hd2020/pl_cmp_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_cmp_CluRate.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 0c3b061b88..9654d064e8 100644
--- a/macro/beamtime/hd2020/rootlogon.C
+++ b/macro/beamtime/hd2020/rootlogon.C
@@ -1,6 +1,3 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //}
   //void rootlogon_nh()
diff --git a/macro/beamtime/load_hst.C b/macro/beamtime/load_hst.C
index 97e5467772..71d253bd1b 100644
--- a/macro/beamtime/load_hst.C
+++ b/macro/beamtime/load_hst.C
@@ -1,6 +1,3 @@
-/** @file load_hst.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void load_hst(TString cstr = "hst/default.hst.root")
 {
   // Read histogramms from the file
diff --git a/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C b/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C
index c85930106f..fd221b16fc 100644
--- a/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C
+++ b/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 Bool_t AnalyzeDigiMcbmFull(Long64_t liNbEntryToRead = -1, TString sInputFileName = "data/unp_mcbm.root")
 {
   Double_t dOffsetRunStartNs = 34062540800;
diff --git a/macro/beamtime/mcbm2018/DataRateMoniPlot.C b/macro/beamtime/mcbm2018/DataRateMoniPlot.C
index 44b9534161..0efeeae4bd 100644
--- a/macro/beamtime/mcbm2018/DataRateMoniPlot.C
+++ b/macro/beamtime/mcbm2018/DataRateMoniPlot.C
@@ -1,6 +1,4 @@
-/** @file DataRateMoniPlot.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t DataRateMoniPlot()
 {
   const UInt_t kuNbFlimLinks = 12;
diff --git a/macro/beamtime/mcbm2018/MonitorRich.C b/macro/beamtime/mcbm2018/MonitorRich.C
index c444b4f9a8..c30c10a0e7 100644
--- a/macro/beamtime/mcbm2018/MonitorRich.C
+++ b/macro/beamtime/mcbm2018/MonitorRich.C
@@ -1,6 +1,3 @@
-/** @file MonitorRich.C
-  * @copyright Copyright (C) 2019 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /** @file MCBM RICH DATA monitoring
  ** Based on MonitorT0 by P.-A. Loizeau
  ** ROOT macro to read tsa files which have been produced with the new data transport
diff --git a/macro/beamtime/mcbm2018/SpillRatePlot.C b/macro/beamtime/mcbm2018/SpillRatePlot.C
index 009a5c3902..abd17d5650 100644
--- a/macro/beamtime/mcbm2018/SpillRatePlot.C
+++ b/macro/beamtime/mcbm2018/SpillRatePlot.C
@@ -1,6 +1,4 @@
-/** @file SpillRatePlot.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t SpillRatePlot(TString sFilename)
 {
   UInt_t fuTotalNrOfDpb = 5;
diff --git a/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C b/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C
index d613da6d0a..6decdc2858 100644
--- a/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C
+++ b/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C
@@ -1,6 +1,4 @@
-/** @file T0CoincPlotSingleRun.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t T0CoincPlotSingleRun(UInt_t uRunId)
 {
   /// Obtaining the plots
diff --git a/macro/beamtime/mcbm2018/T0MoniPlot.C b/macro/beamtime/mcbm2018/T0MoniPlot.C
index 5bcabca171..6c82255e01 100644
--- a/macro/beamtime/mcbm2018/T0MoniPlot.C
+++ b/macro/beamtime/mcbm2018/T0MoniPlot.C
@@ -1,6 +1,4 @@
-/** @file T0MoniPlot.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t T0MoniPlot()
 {
   /// 23/03/2019
diff --git a/macro/beamtime/mcbm2018/TofPulserPlot.C b/macro/beamtime/mcbm2018/TofPulserPlot.C
index b3efdfabfe..d87fa6a5cf 100644
--- a/macro/beamtime/mcbm2018/TofPulserPlot.C
+++ b/macro/beamtime/mcbm2018/TofPulserPlot.C
@@ -1,6 +1,4 @@
-/** @file TofPulserPlot.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t TofPulserPlot(TString sFilename)
 {
 
diff --git a/macro/beamtime/mcbm2018/ana_digi_cal.C b/macro/beamtime/mcbm2018/ana_digi_cal.C
index f2231a1973..c7dabdbe10 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cal.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2019-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                   Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2018/ana_digi_cal_all.C b/macro/beamtime/mcbm2018/ana_digi_cal_all.C
index 6cd5d0c976..bfab3fa924 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cal_all.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cal_all.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal_all.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                       Int_t iSel2 = 0, Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2018/ana_digi_cali.C b/macro/beamtime/mcbm2018/ana_digi_cali.C
index 1a042ff014..90138794de 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cali.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cali.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cali.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                    Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2018/ana_digi_cos.C b/macro/beamtime/mcbm2018/ana_digi_cos.C
index a6e8a7ae21..e1005f7d13 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cos.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cos.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cos.C
-  * @copyright Copyright (C) 2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                   Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iBugCor = 0)
diff --git a/macro/beamtime/mcbm2018/ana_trks.C b/macro/beamtime/mcbm2018/ana_trks.C
index 82cac153d4..0cd986e291 100644
--- a/macro/beamtime/mcbm2018/ana_trks.C
+++ b/macro/beamtime/mcbm2018/ana_trks.C
@@ -1,6 +1,3 @@
-/** @file ana_trks.C
-  * @copyright Copyright (C) 2019-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2018/ana_trksi.C b/macro/beamtime/mcbm2018/ana_trksi.C
index 0760154ced..fb77282196 100644
--- a/macro/beamtime/mcbm2018/ana_trksi.C
+++ b/macro/beamtime/mcbm2018/ana_trksi.C
@@ -1,6 +1,3 @@
-/** @file ana_trksi.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
                Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2018/build_events.C b/macro/beamtime/mcbm2018/build_events.C
index 1c2740fe6c..b670e4800a 100644
--- a/macro/beamtime/mcbm2018/build_events.C
+++ b/macro/beamtime/mcbm2018/build_events.C
@@ -1,8 +1,6 @@
-/** @file build_events.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void build_events(Int_t nEvents = 1, UInt_t uRunId = 0, TString fileName = "", TString outDir = "data/")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2018/check_events.C b/macro/beamtime/mcbm2018/check_events.C
index c7dd06b6ff..c03af3b8b0 100644
--- a/macro/beamtime/mcbm2018/check_events.C
+++ b/macro/beamtime/mcbm2018/check_events.C
@@ -1,6 +1,3 @@
-/** @file check_events.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 4ee7ffbac4..717a55c984 100644
--- a/macro/beamtime/mcbm2018/check_timing.C
+++ b/macro/beamtime/mcbm2018/check_timing.C
@@ -1,8 +1,6 @@
-/** @file check_timing.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void check_timing(Int_t nEvents = 1, TString fileName = "")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2018/dis_digi.C b/macro/beamtime/mcbm2018/dis_digi.C
index d38f667945..9cca8c4af3 100644
--- a/macro/beamtime/mcbm2018/dis_digi.C
+++ b/macro/beamtime/mcbm2018/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Double_t dDeadtime = 50, Int_t iGenCor = 1, Int_t iTrackingSetup = 1, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/mcbm2018/dis_trks.C b/macro/beamtime/mcbm2018/dis_trks.C
index 6298cf69ff..f6ba4105ae 100644
--- a/macro/beamtime/mcbm2018/dis_trks.C
+++ b/macro/beamtime/mcbm2018/dis_trks.C
@@ -1,6 +1,3 @@
-/** @file dis_trks.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C b/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C
index 3604bac8f1..f24f348608 100644
--- a/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C
+++ b/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C
@@ -1,6 +1,5 @@
-/** @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 **/
+
+
 void eLinkMappingCrobStsFebA()
 {
   const UInt_t kuNbElinks             = 42;
diff --git a/macro/beamtime/mcbm2018/pl_all_2D.C b/macro/beamtime/mcbm2018/pl_all_2D.C
index 011a99b896..dd75424769 100644
--- a/macro/beamtime/mcbm2018/pl_all_2D.C
+++ b/macro/beamtime/mcbm2018/pl_all_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_2D.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_CluMul.C b/macro/beamtime/mcbm2018/pl_all_CluMul.C
index 417ca4d367..24cffaf29d 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluMul.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNSt = 6, Double_t MulMax = 100)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C b/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C
index fc50acbac1..3ae8655801 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluPosEvol.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_CluRate.C b/macro/beamtime/mcbm2018/pl_all_CluRate.C
index 499a941b5b..2b945f96b8 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluRate.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluRate.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluRate(Int_t iNSt = 6, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C b/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C
index 8ac4ce2ddf..a7327b020a 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluTimeEvol.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluTimeEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_DigiCor.C b/macro/beamtime/mcbm2018/pl_all_DigiCor.C
index c2309e5d9f..fa85a67894 100644
--- a/macro/beamtime/mcbm2018/pl_all_DigiCor.C
+++ b/macro/beamtime/mcbm2018/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_Sel2D.C b/macro/beamtime/mcbm2018/pl_all_Sel2D.C
index 669810afdc..4adab3e7f5 100644
--- a/macro/beamtime/mcbm2018/pl_all_Sel2D.C
+++ b/macro/beamtime/mcbm2018/pl_all_Sel2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Sel2D.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_all_Track2D.C b/macro/beamtime/mcbm2018/pl_all_Track2D.C
index 4e171262be..f9137450eb 100644
--- a/macro/beamtime/mcbm2018/pl_all_Track2D.C
+++ b/macro/beamtime/mcbm2018/pl_all_Track2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Track2D.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2018/pl_raw_evt.C b/macro/beamtime/mcbm2018/pl_raw_evt.C
index 78cb753c25..03dbe4c973 100644
--- a/macro/beamtime/mcbm2018/pl_raw_evt.C
+++ b/macro/beamtime/mcbm2018/pl_raw_evt.C
@@ -1,6 +1,3 @@
-/** @file pl_raw_evt.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_raw_evt()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2019/MonitorRich.C b/macro/beamtime/mcbm2019/MonitorRich.C
index c2288289d0..a7a99e09b9 100644
--- a/macro/beamtime/mcbm2019/MonitorRich.C
+++ b/macro/beamtime/mcbm2019/MonitorRich.C
@@ -1,6 +1,3 @@
-/** @file MonitorRich.C
-  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /** @file MCBM RICH DATA monitoring
  ** Based on MonitorT0 by P.-A. Loizeau
  ** ROOT macro to read tsa files which have been produced with the new data transport
diff --git a/macro/beamtime/mcbm2019/build_events.C b/macro/beamtime/mcbm2019/build_events.C
index 23597369c3..4425556aae 100644
--- a/macro/beamtime/mcbm2019/build_events.C
+++ b/macro/beamtime/mcbm2019/build_events.C
@@ -1,8 +1,6 @@
-/** @file build_events.C
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void build_events(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2019/check_events.C b/macro/beamtime/mcbm2019/check_events.C
index 79a90d63fe..428087c3e3 100644
--- a/macro/beamtime/mcbm2019/check_events.C
+++ b/macro/beamtime/mcbm2019/check_events.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 4a77eb7714..a03ad75b89 100644
--- a/macro/beamtime/mcbm2019/check_much_digis.C
+++ b/macro/beamtime/mcbm2019/check_much_digis.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 07c77aa945..e1a3e493ba 100644
--- a/macro/beamtime/mcbm2019/check_pulser.C
+++ b/macro/beamtime/mcbm2019/check_pulser.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void check_pulser(UInt_t uRunId = 0, Int_t nrEvents = 0, TString sDir = "data")
 {
   if (uRunId < 353) return kFALSE;
diff --git a/macro/beamtime/mcbm2019/check_sts_digis.C b/macro/beamtime/mcbm2019/check_sts_digis.C
index 2a15163fba..111027e7dc 100644
--- a/macro/beamtime/mcbm2019/check_sts_digis.C
+++ b/macro/beamtime/mcbm2019/check_sts_digis.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 4fcb656664..d51eb8dae9 100644
--- a/macro/beamtime/mcbm2019/check_timing.C
+++ b/macro/beamtime/mcbm2019/check_timing.C
@@ -1,8 +1,6 @@
-/** @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 **/
 void check_timing(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2019/mcbm2019_reco.C b/macro/beamtime/mcbm2019/mcbm2019_reco.C
index 0711809821..7c09f0d201 100644
--- a/macro/beamtime/mcbm2019/mcbm2019_reco.C
+++ b/macro/beamtime/mcbm2019/mcbm2019_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2019)
diff --git a/macro/beamtime/mcbm2019/mcbm_reco.C b/macro/beamtime/mcbm2019/mcbm_reco.C
index da2a62225a..d7751a7fd2 100644
--- a/macro/beamtime/mcbm2019/mcbm_reco.C
+++ b/macro/beamtime/mcbm2019/mcbm_reco.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2019)
diff --git a/macro/beamtime/mcbm2020/MonitorRich.C b/macro/beamtime/mcbm2020/MonitorRich.C
index e9165dfedc..cd56749a16 100644
--- a/macro/beamtime/mcbm2020/MonitorRich.C
+++ b/macro/beamtime/mcbm2020/MonitorRich.C
@@ -1,6 +1,3 @@
-/** @file MonitorRich.C
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /** @file MCBM RICH DATA monitoring
  ** Based on MonitorT0 by P.-A. Loizeau
  ** ROOT macro to read tsa files which have been produced with the new data transport
diff --git a/macro/beamtime/mcbm2020/ana_digi_cal.C b/macro/beamtime/mcbm2020/ana_digi_cal.C
index 720f39e7c9..afbe799f37 100644
--- a/macro/beamtime/mcbm2020/ana_digi_cal.C
+++ b/macro/beamtime/mcbm2020/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                   Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2020/ana_digi_cal_all.C b/macro/beamtime/mcbm2020/ana_digi_cal_all.C
index 7c07a798f1..f0e3ce65ec 100644
--- a/macro/beamtime/mcbm2020/ana_digi_cal_all.C
+++ b/macro/beamtime/mcbm2020/ana_digi_cal_all.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal_all.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                       Int_t iSel2 = 0, Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2020/ana_digi_cali.C b/macro/beamtime/mcbm2020/ana_digi_cali.C
index b8626cb246..e38b6a8feb 100644
--- a/macro/beamtime/mcbm2020/ana_digi_cali.C
+++ b/macro/beamtime/mcbm2020/ana_digi_cali.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cali.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                    Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 0)
diff --git a/macro/beamtime/mcbm2020/ana_trks.C b/macro/beamtime/mcbm2020/ana_trks.C
index 79cbc318e5..a44cbb1cf8 100644
--- a/macro/beamtime/mcbm2020/ana_trks.C
+++ b/macro/beamtime/mcbm2020/ana_trks.C
@@ -1,6 +1,3 @@
-/** @file ana_trks.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2020/ana_trks_eval.C b/macro/beamtime/mcbm2020/ana_trks_eval.C
index 73357ee285..b268574612 100644
--- a/macro/beamtime/mcbm2020/ana_trks_eval.C
+++ b/macro/beamtime/mcbm2020/ana_trks_eval.C
@@ -1,6 +1,3 @@
-/** @file ana_trks_eval.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
                    Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2020/ana_trksi.C b/macro/beamtime/mcbm2020/ana_trksi.C
index 235d3e5484..d5ba36f8e1 100644
--- a/macro/beamtime/mcbm2020/ana_trksi.C
+++ b/macro/beamtime/mcbm2020/ana_trksi.C
@@ -1,6 +1,3 @@
-/** @file ana_trksi.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
                Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2020/build_event_win.C b/macro/beamtime/mcbm2020/build_event_win.C
index 896fb31557..f3de0f9d68 100644
--- a/macro/beamtime/mcbm2020/build_event_win.C
+++ b/macro/beamtime/mcbm2020/build_event_win.C
@@ -1,6 +1,4 @@
-/** @file build_event_win.C
-  * @copyright Copyright (C) 2020-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 /// FIXME: Disable clang formatting to keep easy parameters overview
 /* clang-format off */
 Bool_t build_event_win(UInt_t uRunId        = 0,
diff --git a/macro/beamtime/mcbm2020/build_event_win_kronos.C b/macro/beamtime/mcbm2020/build_event_win_kronos.C
index c7cf8566cb..31203fdaf4 100644
--- a/macro/beamtime/mcbm2020/build_event_win_kronos.C
+++ b/macro/beamtime/mcbm2020/build_event_win_kronos.C
@@ -1,7 +1,5 @@
-/** @file build_event_win_kronos.C
-  * @copyright Copyright (C) 2020-2021 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "build_event_win.C"
+
 /// FIXME: Disable clang formatting to keep easy parameters overview
 /* clang-format off */
 Bool_t build_event_win_kronos(UInt_t uRunIdx = 28,
diff --git a/macro/beamtime/mcbm2020/build_events.C b/macro/beamtime/mcbm2020/build_events.C
index ca02d60a3e..b308a1a598 100644
--- a/macro/beamtime/mcbm2020/build_events.C
+++ b/macro/beamtime/mcbm2020/build_events.C
@@ -1,8 +1,6 @@
-/** @file build_events.C
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void build_events(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2020/check_events.C b/macro/beamtime/mcbm2020/check_events.C
index 11d26572bb..98d6af60ea 100644
--- a/macro/beamtime/mcbm2020/check_events.C
+++ b/macro/beamtime/mcbm2020/check_events.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 70574d27c3..ca1c298fe0 100644
--- a/macro/beamtime/mcbm2020/check_much_digis.C
+++ b/macro/beamtime/mcbm2020/check_much_digis.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 0debdd6969..4de824866f 100644
--- a/macro/beamtime/mcbm2020/check_pulser.C
+++ b/macro/beamtime/mcbm2020/check_pulser.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void check_pulser(UInt_t uRunId = 0, Int_t nrEvents = 0, TString sDir = "data")
 {
   if (uRunId < 353) return kFALSE;
diff --git a/macro/beamtime/mcbm2020/check_sts_digis.C b/macro/beamtime/mcbm2020/check_sts_digis.C
index bb785fe995..869bd237b1 100644
--- a/macro/beamtime/mcbm2020/check_sts_digis.C
+++ b/macro/beamtime/mcbm2020/check_sts_digis.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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 1aa857b705..c444a22d35 100644
--- a/macro/beamtime/mcbm2020/check_timing.C
+++ b/macro/beamtime/mcbm2020/check_timing.C
@@ -1,8 +1,6 @@
-/** @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 **/
 void check_timing(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2020/check_timing_any.C b/macro/beamtime/mcbm2020/check_timing_any.C
index 8a5a90c788..2bf83be557 100644
--- a/macro/beamtime/mcbm2020/check_timing_any.C
+++ b/macro/beamtime/mcbm2020/check_timing_any.C
@@ -1,8 +1,6 @@
-/** @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 **/
 void check_timing_any(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
+
   // ========================================================================
   //          Adjust this part according to your requirements
 
diff --git a/macro/beamtime/mcbm2020/dis_digi.C b/macro/beamtime/mcbm2020/dis_digi.C
index d2a0c711a2..5456055661 100644
--- a/macro/beamtime/mcbm2020/dis_digi.C
+++ b/macro/beamtime/mcbm2020/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Double_t dDeadtime = 50, Int_t iGenCor = 1, Int_t iTrackingSetup = 1, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/mcbm2020/dis_trks.C b/macro/beamtime/mcbm2020/dis_trks.C
index afb3c800a1..c1e2b5f389 100644
--- a/macro/beamtime/mcbm2020/dis_trks.C
+++ b/macro/beamtime/mcbm2020/dis_trks.C
@@ -1,6 +1,3 @@
-/** @file dis_trks.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 5., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2020/mcbm_build_and_reco.C b/macro/beamtime/mcbm2020/mcbm_build_and_reco.C
index 315658dfc7..404e09bad7 100644
--- a/macro/beamtime/mcbm2020/mcbm_build_and_reco.C
+++ b/macro/beamtime/mcbm2020/mcbm_build_and_reco.C
@@ -1,6 +1,3 @@
-/** @file mcbm_build_and_reco.C
-  * @copyright Copyright (C) 2020-2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
index d8fb74ee60..7ecbc3027b 100644
--- a/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
@@ -1,6 +1,3 @@
-/** @file mcbm_build_and_reco_kronos.C
-  * @copyright Copyright (C) 2020-2021 GSI,IKF-UFra
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_event_ana.C b/macro/beamtime/mcbm2020/mcbm_event_ana.C
index 1a54709a6c..c08abeaf35 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_ana.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_ana.C
@@ -1,6 +1,3 @@
-/** @file mcbm_event_ana.C
-  * @copyright Copyright (C) 2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_event_reco.C b/macro/beamtime/mcbm2020/mcbm_event_reco.C
index 8fac81dd52..447369bab4 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_reco.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_reco.C
@@ -1,6 +1,3 @@
-/** @file mcbm_event_reco.C
-  * @copyright Copyright (C) 2020-2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C b/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C
index 652d34eb5e..a85fbad71f 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C
@@ -1,6 +1,3 @@
-/** @file mcbm_event_reco_ana.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
index 190d6ba814..03552c2ca0 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_reco.C b/macro/beamtime/mcbm2020/mcbm_reco.C
index 9058e02d89..0b04ca81c1 100644
--- a/macro/beamtime/mcbm2020/mcbm_reco.C
+++ b/macro/beamtime/mcbm2020/mcbm_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
index 719ba5e479..07ba936537 100644
--- a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_tof_tracking.C b/macro/beamtime/mcbm2020/mcbm_tof_tracking.C
index fe1002561f..436401a385 100644
--- a/macro/beamtime/mcbm2020/mcbm_tof_tracking.C
+++ b/macro/beamtime/mcbm2020/mcbm_tof_tracking.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction "TOF tracks" in mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C b/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C
index 885e931ccc..846216de0d 100644
--- a/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction "TOF tracks" in mcbm data (2020)
diff --git a/macro/beamtime/mcbm2020/mrich_reco.C b/macro/beamtime/mcbm2020/mrich_reco.C
index f69330381c..3bc3205df4 100644
--- a/macro/beamtime/mcbm2020/mrich_reco.C
+++ b/macro/beamtime/mcbm2020/mrich_reco.C
@@ -1,6 +1,3 @@
-/** @file mrich_reco.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void mrich_reco(const string srcfolder = "/lustre/cbm/users/adrian/mcbmbeamtime/cbmsource/"
                                          "macro/beamtime/mcbm2020/data",
                 const unsigned int runId = 759,  // used for the output folder
diff --git a/macro/beamtime/mcbm2020/mtof_build_and_reco.C b/macro/beamtime/mcbm2020/mtof_build_and_reco.C
index 3eeba1e647..2523b51947 100644
--- a/macro/beamtime/mcbm2020/mtof_build_and_reco.C
+++ b/macro/beamtime/mcbm2020/mtof_build_and_reco.C
@@ -1,6 +1,3 @@
-/** @file mtof_build_and_reco.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 // N.Herrmann   02.05.2020
 //
diff --git a/macro/beamtime/mcbm2020/mtof_build_and_reco_kronos.C b/macro/beamtime/mcbm2020/mtof_build_and_reco_kronos.C
index 632a126e8c..2523b51947 100644
--- a/macro/beamtime/mcbm2020/mtof_build_and_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mtof_build_and_reco_kronos.C
@@ -1,6 +1,3 @@
-/** @file mtof_build_and_reco_kronos.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 // N.Herrmann   02.05.2020
 //
diff --git a/macro/beamtime/mcbm2020/mtof_reco.C b/macro/beamtime/mcbm2020/mtof_reco.C
index 53f27ccbff..08507b66f5 100644
--- a/macro/beamtime/mcbm2020/mtof_reco.C
+++ b/macro/beamtime/mcbm2020/mtof_reco.C
@@ -1,6 +1,3 @@
-/** @file mtof_reco.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 // N.Herrmann   02.05.2020
 //
diff --git a/macro/beamtime/mcbm2020/pl_all_2D.C b/macro/beamtime/mcbm2020/pl_all_2D.C
index 32e4e051ed..d320259b18 100644
--- a/macro/beamtime/mcbm2020/pl_all_2D.C
+++ b/macro/beamtime/mcbm2020/pl_all_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_2D.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_3D.C b/macro/beamtime/mcbm2020/pl_all_3D.C
index 2d194eb5b0..0f72dbba0d 100644
--- a/macro/beamtime/mcbm2020/pl_all_3D.C
+++ b/macro/beamtime/mcbm2020/pl_all_3D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_3D.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_3D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_CluMul.C b/macro/beamtime/mcbm2020/pl_all_CluMul.C
index ce6fdb438f..24cffaf29d 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluMul.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNSt = 6, Double_t MulMax = 100)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C b/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C
index 81b9522f6a..3ae8655801 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluPosEvol.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_CluRate.C b/macro/beamtime/mcbm2020/pl_all_CluRate.C
index 758aa3783f..c48d3b3f2d 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluRate.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluRate.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluRate(Int_t iNSt = 4, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C b/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C
index 3dee3808e4..a7327b020a 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluTimeEvol.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluTimeEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_DTLastHits.C b/macro/beamtime/mcbm2020/pl_all_DTLastHits.C
index 59097e42a9..bae663ee28 100644
--- a/macro/beamtime/mcbm2020/pl_all_DTLastHits.C
+++ b/macro/beamtime/mcbm2020/pl_all_DTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DTLastHits.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiCor.C b/macro/beamtime/mcbm2020/pl_all_DigiCor.C
index 66b0b741de..fa85a67894 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiCor.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C b/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C
index 81879921c0..391fb42d7a 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiDTFD.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiDTFD(Int_t iOpt = 0, Double_t dYmax = 0., Int_t iNDet = 2)
 {
   Int_t iOpt1 = iOpt % 10;
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C b/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C
index ce6cea1eea..35064e26af 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiDTLD.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiDTLD(Int_t iNDet = 6, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiTot.C b/macro/beamtime/mcbm2020/pl_all_DigiTot.C
index 150ea1f2e0..2496b4cafd 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiTot.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiTot.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiTot.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiTot(Int_t iNDet = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_Sel2D.C b/macro/beamtime/mcbm2020/pl_all_Sel2D.C
index 7571fdc09b..1b38698985 100644
--- a/macro/beamtime/mcbm2020/pl_all_Sel2D.C
+++ b/macro/beamtime/mcbm2020/pl_all_Sel2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Sel2D.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_all_Track2D.C b/macro/beamtime/mcbm2020/pl_all_Track2D.C
index ad0e8cce5c..9e56b8e16a 100644
--- a/macro/beamtime/mcbm2020/pl_all_Track2D.C
+++ b/macro/beamtime/mcbm2020/pl_all_Track2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Track2D.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2020/pl_cmp_CluRate.C b/macro/beamtime/mcbm2020/pl_cmp_CluRate.C
index e189b8a4e6..64f465aa4e 100644
--- a/macro/beamtime/mcbm2020/pl_cmp_CluRate.C
+++ b/macro/beamtime/mcbm2020/pl_cmp_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_cmp_CluRate.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/ana_digi_cal.C b/macro/beamtime/mcbm2021/ana_digi_cal.C
index 703c0a580b..e7a633f2af 100644
--- a/macro/beamtime/mcbm2021/ana_digi_cal.C
+++ b/macro/beamtime/mcbm2021/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                   Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2021/ana_digi_cal_all.C b/macro/beamtime/mcbm2021/ana_digi_cal_all.C
index 3cf3f8d18f..4a9294ef39 100644
--- a/macro/beamtime/mcbm2021/ana_digi_cal_all.C
+++ b/macro/beamtime/mcbm2021/ana_digi_cal_all.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal_all.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                       Int_t iSel2 = 0, Double_t dDeadtime = 50, TString cCalId = "XXX", Int_t iPlot = 1)
diff --git a/macro/beamtime/mcbm2021/ana_trks.C b/macro/beamtime/mcbm2021/ana_trks.C
index b8dbb23609..01512dd791 100644
--- a/macro/beamtime/mcbm2021/ana_trks.C
+++ b/macro/beamtime/mcbm2021/ana_trks.C
@@ -1,6 +1,3 @@
-/** @file ana_trks.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2021/ana_trks_eval.C b/macro/beamtime/mcbm2021/ana_trks_eval.C
index 1315c18918..24437f0258 100644
--- a/macro/beamtime/mcbm2021/ana_trks_eval.C
+++ b/macro/beamtime/mcbm2021/ana_trks_eval.C
@@ -1,6 +1,3 @@
-/** @file ana_trks_eval.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
                    Double_t dChi2Lim2 = 500., Double_t dDeadtime = 50, TString cCalId = "", Int_t iAnaCor = 1,
diff --git a/macro/beamtime/mcbm2021/dis_digi.C b/macro/beamtime/mcbm2021/dis_digi.C
index ed0a9a0dc6..f70ffb1fc1 100644
--- a/macro/beamtime/mcbm2021/dis_digi.C
+++ b/macro/beamtime/mcbm2021/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Double_t dDeadtime = 50, Int_t iGenCor = 1, Int_t iTrackingSetup = 1, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/mcbm2021/pl_all_2D.C b/macro/beamtime/mcbm2021/pl_all_2D.C
index 83d3ec0a36..c79ca26d4b 100644
--- a/macro/beamtime/mcbm2021/pl_all_2D.C
+++ b/macro/beamtime/mcbm2021/pl_all_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_2D.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_3D.C b/macro/beamtime/mcbm2021/pl_all_3D.C
index 5e1b8df774..0f72dbba0d 100644
--- a/macro/beamtime/mcbm2021/pl_all_3D.C
+++ b/macro/beamtime/mcbm2021/pl_all_3D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_3D.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_3D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_CluMul.C b/macro/beamtime/mcbm2021/pl_all_CluMul.C
index 7e1524d2af..24cffaf29d 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluMul.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNSt = 6, Double_t MulMax = 100)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C b/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C
index f9398986d6..3ae8655801 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluPosEvol.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_CluRate.C b/macro/beamtime/mcbm2021/pl_all_CluRate.C
index 3e5cce9bd0..c48d3b3f2d 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluRate.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluRate.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluRate(Int_t iNSt = 4, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C b/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C
index 70cd44f27e..a7327b020a 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluTimeEvol.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluTimeEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_DTLastHits.C b/macro/beamtime/mcbm2021/pl_all_DTLastHits.C
index a533f2d469..bae663ee28 100644
--- a/macro/beamtime/mcbm2021/pl_all_DTLastHits.C
+++ b/macro/beamtime/mcbm2021/pl_all_DTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DTLastHits.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiCor.C b/macro/beamtime/mcbm2021/pl_all_DigiCor.C
index 7d62e39cce..bfe2d91bc2 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiCor.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C b/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C
index 6dad153758..391fb42d7a 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiDTFD.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiDTFD(Int_t iOpt = 0, Double_t dYmax = 0., Int_t iNDet = 2)
 {
   Int_t iOpt1 = iOpt % 10;
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C b/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C
index aff02f3367..c6436feca1 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiDTLD.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiDTLD(Int_t iNDet = 4, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiMul.C b/macro/beamtime/mcbm2021/pl_all_DigiMul.C
index 26533e0589..d3787d2ca7 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiMul.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiMul.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiMul(Int_t iNDet = 4, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiTot.C b/macro/beamtime/mcbm2021/pl_all_DigiTot.C
index fb1686461d..a59bef81ca 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiTot.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiTot.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiTot.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiTot(Int_t iNDet = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_Sel2D.C b/macro/beamtime/mcbm2021/pl_all_Sel2D.C
index 64311bfd64..3dfb4c0591 100644
--- a/macro/beamtime/mcbm2021/pl_all_Sel2D.C
+++ b/macro/beamtime/mcbm2021/pl_all_Sel2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Sel2D.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_all_Track2D.C b/macro/beamtime/mcbm2021/pl_all_Track2D.C
index 1b6c697690..b99fd15073 100644
--- a/macro/beamtime/mcbm2021/pl_all_Track2D.C
+++ b/macro/beamtime/mcbm2021/pl_all_Track2D.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Track2D.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/mcbm2021/pl_cmp_CluRate.C b/macro/beamtime/mcbm2021/pl_cmp_CluRate.C
index c368813e76..64f465aa4e 100644
--- a/macro/beamtime/mcbm2021/pl_cmp_CluRate.C
+++ b/macro/beamtime/mcbm2021/pl_cmp_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_cmp_CluRate.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 0d760a3086..9654d064e8 100644
--- a/macro/beamtime/mcbm2021/rootlogon.C
+++ b/macro/beamtime/mcbm2021/rootlogon.C
@@ -1,6 +1,3 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //}
   //void rootlogon_nh()
diff --git a/macro/beamtime/pl_CosmicHst.C b/macro/beamtime/pl_CosmicHst.C
index da46f1daf5..219c4af35e 100644
--- a/macro/beamtime/pl_CosmicHst.C
+++ b/macro/beamtime/pl_CosmicHst.C
@@ -1,6 +1,3 @@
-/** @file pl_CosmicHst.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_CosmicHst(Int_t iNSt = 10, Int_t iOpt = 0, Int_t iSel = 0, Int_t i1D = 0, Double_t dYmax = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_CosmicHst1.C b/macro/beamtime/pl_CosmicHst1.C
index f027a3a51e..40db0a8316 100644
--- a/macro/beamtime/pl_CosmicHst1.C
+++ b/macro/beamtime/pl_CosmicHst1.C
@@ -1,6 +1,3 @@
-/** @file pl_CosmicHst1.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_CosmicHst1(Int_t iNSt = 6, Int_t iOpt = 0, Int_t iSel = 0, Int_t i1D = 0, Double_t dYmax = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_Datime.C b/macro/beamtime/pl_Datime.C
index 9389bad444..ac45e9dee2 100644
--- a/macro/beamtime/pl_Datime.C
+++ b/macro/beamtime/pl_Datime.C
@@ -1,6 +1,3 @@
-/** @file pl_Datime.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Datime(TString sysinfo = "")
 {
   TCanvas* can = (TCanvas*) gROOT->FindObjectAny("can");
diff --git a/macro/beamtime/pl_Dut_DTLH.C b/macro/beamtime/pl_Dut_DTLH.C
index 8cc9f2cef1..38a71f89d7 100644
--- a/macro/beamtime/pl_Dut_DTLH.C
+++ b/macro/beamtime/pl_Dut_DTLH.C
@@ -1,6 +1,3 @@
-/** @file pl_Dut_DTLH.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Dut_DTLH(Int_t iDut = 910, TString sysinfo = "")
 {
   gROOT->LoadMacro("pl_Datime.C");
diff --git a/macro/beamtime/pl_Dut_Res.C b/macro/beamtime/pl_Dut_Res.C
index 583a06a9d9..93d70fb8a6 100644
--- a/macro/beamtime/pl_Dut_Res.C
+++ b/macro/beamtime/pl_Dut_Res.C
@@ -1,6 +1,3 @@
-/** @file pl_Dut_Res.C
-  * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Dut_Res(Int_t iDut = 911, TString sysinfo = "")
 {
   gROOT->LoadMacro(((TString) gSystem->Getenv("VMCWORKDIR") + "/macro/beamtime/pl_Datime.C").Data());
diff --git a/macro/beamtime/pl_Dut_Vel.C b/macro/beamtime/pl_Dut_Vel.C
index 6de21f739a..0b089bc60d 100644
--- a/macro/beamtime/pl_Dut_Vel.C
+++ b/macro/beamtime/pl_Dut_Vel.C
@@ -1,6 +1,3 @@
-/** @file pl_Dut_Vel.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 037781b9b2..9a06bacaa9 100644
--- a/macro/beamtime/pl_Eff_Chi.C
+++ b/macro/beamtime/pl_Eff_Chi.C
@@ -1,6 +1,3 @@
-/** @file pl_Eff_Chi.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Eff_Chi(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
   gROOT->LoadMacro("pl_Datime.C");
diff --git a/macro/beamtime/pl_Eff_DTLH.C b/macro/beamtime/pl_Eff_DTLH.C
index 7660763637..30b1b0d7c4 100644
--- a/macro/beamtime/pl_Eff_DTLH.C
+++ b/macro/beamtime/pl_Eff_DTLH.C
@@ -1,6 +1,3 @@
-/** @file pl_Eff_DTLH.C
-  * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Eff_DTLH(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
   gROOT->LoadMacro(((TString) gSystem->Getenv("VMCWORKDIR") + "/macro/beamtime/pl_Datime.C").Data());
diff --git a/macro/beamtime/pl_Eff_Mul.C b/macro/beamtime/pl_Eff_Mul.C
index 14ea31d67f..8eef0aed4e 100644
--- a/macro/beamtime/pl_Eff_Mul.C
+++ b/macro/beamtime/pl_Eff_Mul.C
@@ -1,6 +1,3 @@
-/** @file pl_Eff_Mul.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Eff_Mul(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
   gROOT->LoadMacro("pl_Datime.C");
diff --git a/macro/beamtime/pl_Eff_TIR.C b/macro/beamtime/pl_Eff_TIR.C
index 96eba09088..857b699532 100644
--- a/macro/beamtime/pl_Eff_TIR.C
+++ b/macro/beamtime/pl_Eff_TIR.C
@@ -1,6 +1,3 @@
-/** @file pl_Eff_TIR.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 24e3086495..096e289b34 100644
--- a/macro/beamtime/pl_Eff_TIS.C
+++ b/macro/beamtime/pl_Eff_TIS.C
@@ -1,6 +1,3 @@
-/** @file pl_Eff_TIS.C
-  * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Eff_TIS(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
   gROOT->LoadMacro(((TString) gSystem->Getenv("VMCWORKDIR") + "/macro/beamtime/pl_Datime.C").Data());
diff --git a/macro/beamtime/pl_Eff_XY_1.C b/macro/beamtime/pl_Eff_XY_1.C
index 80a753d986..8d2a64f42a 100644
--- a/macro/beamtime/pl_Eff_XY_1.C
+++ b/macro/beamtime/pl_Eff_XY_1.C
@@ -1,6 +1,3 @@
-/** @file pl_Eff_XY_1.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 70b7c0836d..31b0eb86a2 100644
--- a/macro/beamtime/pl_Efficiency_XY.C
+++ b/macro/beamtime/pl_Efficiency_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_Efficiency_XY.C
-  * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Eff_XY(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
   gROOT->LoadMacro(((TString) gSystem->Getenv("VMCWORKDIR") + "/macro/beamtime/pl_Datime.C").Data());
diff --git a/macro/beamtime/pl_EvCluMul.C b/macro/beamtime/pl_EvCluMul.C
index 8a277c5bfc..caec63b900 100644
--- a/macro/beamtime/pl_EvCluMul.C
+++ b/macro/beamtime/pl_EvCluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_EvCluMul.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_EvCluMul(Double_t dTmin = 0., Double_t dTmax = 1800.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_TIR.C b/macro/beamtime/pl_TIR.C
index 5f2d6d74c3..054827eee5 100644
--- a/macro/beamtime/pl_TIR.C
+++ b/macro/beamtime/pl_TIR.C
@@ -1,6 +1,3 @@
-/** @file pl_TIR.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 79d45a192d..859fb8bdd7 100644
--- a/macro/beamtime/pl_TIS.C
+++ b/macro/beamtime/pl_TIS.C
@@ -1,6 +1,3 @@
-/** @file pl_TIS.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_TIS(TString sysinfo = "", Double_t dFracMax = 0.1)
 {
   gROOT->LoadMacro(((TString) gSystem->Getenv("VMCWORKDIR") + "/macro/beamtime/pl_Datime.C").Data());
diff --git a/macro/beamtime/pl_TIS2.C b/macro/beamtime/pl_TIS2.C
index eea5d01e71..434f010fd8 100644
--- a/macro/beamtime/pl_TIS2.C
+++ b/macro/beamtime/pl_TIS2.C
@@ -1,6 +1,3 @@
-/** @file pl_TIS2.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_TIS2(Double_t dTmin = 0., Double_t dTmax = 1., TString sysinfo = "")
 {
   gROOT->LoadMacro("pl_Datime.C");
diff --git a/macro/beamtime/pl_Track2D.C b/macro/beamtime/pl_Track2D.C
index 7ed348f831..240babceb8 100644
--- a/macro/beamtime/pl_Track2D.C
+++ b/macro/beamtime/pl_Track2D.C
@@ -1,6 +1,3 @@
-/** @file pl_Track2D.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Track2D(Int_t iOpt = 1, Int_t iCounterId = 22, Int_t iStrip = -1, Double_t TotMax = 10.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_UHit.C b/macro/beamtime/pl_UHit.C
index e031939d93..1f1b3417de 100644
--- a/macro/beamtime/pl_UHit.C
+++ b/macro/beamtime/pl_UHit.C
@@ -1,6 +1,3 @@
-/** @file pl_UHit.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_XY_3D.C b/macro/beamtime/pl_XY_3D.C
index c4f3bef0dc..1f3b3d49bc 100644
--- a/macro/beamtime/pl_XY_3D.C
+++ b/macro/beamtime/pl_XY_3D.C
@@ -1,6 +1,4 @@
-/** @file pl_XY_3D.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_XY_3D(Int_t iNSt = 4, Int_t iOpt = 0, Int_t i2D = 0, Int_t i1D = 0, Double_t dYmax = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_XY_fit.C b/macro/beamtime/pl_XY_fit.C
index 57a27de37c..678424653a 100644
--- a/macro/beamtime/pl_XY_fit.C
+++ b/macro/beamtime/pl_XY_fit.C
@@ -1,6 +1,3 @@
-/** @file pl_XY_fit.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_XY_fit(Int_t iNSt = 4, Int_t NewNbinsX = 32, Int_t NewNbinsY = 32, Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_XY_trk.C b/macro/beamtime/pl_XY_trk.C
index 95d6a79814..6e1ea93e15 100644
--- a/macro/beamtime/pl_XY_trk.C
+++ b/macro/beamtime/pl_XY_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_XY_trk.C
-  * @copyright Copyright (C) 2017-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_XY_trk(Int_t NSt = 4, Double_t MinEff = 0.5, Double_t dThr = 0.1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_CalPar.C b/macro/beamtime/pl_all_CalPar.C
index 62012f244f..5649098450 100644
--- a/macro/beamtime/pl_all_CalPar.C
+++ b/macro/beamtime/pl_all_CalPar.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CalPar.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CalPar(Int_t iNSt = 6, Int_t item = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_CluMul.C b/macro/beamtime/pl_all_CluMul.C
index 120d5a6452..501c278b28 100644
--- a/macro/beamtime/pl_all_CluMul.C
+++ b/macro/beamtime/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNSt = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_CluRate.C b/macro/beamtime/pl_all_CluRate.C
index 391845a0aa..52aa476e8b 100644
--- a/macro/beamtime/pl_all_CluRate.C
+++ b/macro/beamtime/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluRate.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluRate(Int_t iNSt = 6, Double_t Tstart = 0., Double_t Tend = 800.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_CluRateRatio.C b/macro/beamtime/pl_all_CluRateRatio.C
index efb4470492..4852362c69 100644
--- a/macro/beamtime/pl_all_CluRateRatio.C
+++ b/macro/beamtime/pl_all_CluRateRatio.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluRateRatio.C
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 f4c5e70541..51a84ef8fc 100644
--- a/macro/beamtime/pl_all_CluSizeDTLastHits.C
+++ b/macro/beamtime/pl_all_CluSizeDTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluSizeDTLastHits.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluSizeDTLastHits(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_DTLastHits.C b/macro/beamtime/pl_all_DTLastHits.C
index a15e110d08..11da5113e6 100644
--- a/macro/beamtime/pl_all_DTLastHits.C
+++ b/macro/beamtime/pl_all_DTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DTLastHits.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_DTLastHits_CluSize.C b/macro/beamtime/pl_all_DTLastHits_CluSize.C
index 2f85a708f1..89755f0c67 100644
--- a/macro/beamtime/pl_all_DTLastHits_CluSize.C
+++ b/macro/beamtime/pl_all_DTLastHits_CluSize.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DTLastHits_CluSize.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DTLastHits_CluSize(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_DTLastHits_Tot.C b/macro/beamtime/pl_all_DTLastHits_Tot.C
index 911c634bfa..3c938cc9df 100644
--- a/macro/beamtime/pl_all_DTLastHits_Tot.C
+++ b/macro/beamtime/pl_all_DTLastHits_Tot.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DTLastHits_Tot.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DTLastHits_Tot(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_DigiCor.C b/macro/beamtime/pl_all_DigiCor.C
index aa5c3a6d93..036ce5ebd9 100644
--- a/macro/beamtime/pl_all_DigiCor.C
+++ b/macro/beamtime/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_Fpar.C b/macro/beamtime/pl_all_Fpar.C
index 89052eab87..d9e55c582f 100644
--- a/macro/beamtime/pl_all_Fpar.C
+++ b/macro/beamtime/pl_all_Fpar.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Fpar.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Fpar(Int_t iNSt = 6, Int_t iPar = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_LHTime.C b/macro/beamtime/pl_all_LHTime.C
index 97f2b7f6b4..1188d3647b 100644
--- a/macro/beamtime/pl_all_LHTime.C
+++ b/macro/beamtime/pl_all_LHTime.C
@@ -1,6 +1,3 @@
-/** @file pl_all_LHTime.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_LHTime(Int_t iNDet = 22, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_Svel.C b/macro/beamtime/pl_all_Svel.C
index 232891c94c..b6be56568d 100644
--- a/macro/beamtime/pl_all_Svel.C
+++ b/macro/beamtime/pl_all_Svel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_Svel.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_Svel(Int_t iNSt = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_TOffDTLastHits.C b/macro/beamtime/pl_all_TOffDTLastHits.C
index d026a123ba..9e668e1c68 100644
--- a/macro/beamtime/pl_all_TOffDTLastHits.C
+++ b/macro/beamtime/pl_all_TOffDTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_TOffDTLastHits.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_TOffDTLastHits(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_TotDTLastHits.C b/macro/beamtime/pl_all_TotDTLastHits.C
index cfd85e739d..34ac413f5e 100644
--- a/macro/beamtime/pl_all_TotDTLastHits.C
+++ b/macro/beamtime/pl_all_TotDTLastHits.C
@@ -1,6 +1,3 @@
-/** @file pl_all_TotDTLastHits.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_TotDTLastHits(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_XY.C b/macro/beamtime/pl_all_XY.C
index b5b36454f3..90b3f83018 100644
--- a/macro/beamtime/pl_all_XY.C
+++ b/macro/beamtime/pl_all_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_all_XY.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_XY(Int_t iNDet = 24, Int_t iMode = 0, Double_t dMax = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_cluWalk.C b/macro/beamtime/pl_all_cluWalk.C
index 1ccff5af13..3e198feaaf 100644
--- a/macro/beamtime/pl_all_cluWalk.C
+++ b/macro/beamtime/pl_all_cluWalk.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalk.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_cluWalkSel.C b/macro/beamtime/pl_all_cluWalkSel.C
index 16b764295a..03b68652ea 100644
--- a/macro/beamtime/pl_all_cluWalkSel.C
+++ b/macro/beamtime/pl_all_cluWalkSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalkSel.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_all_dTSel.C b/macro/beamtime/pl_all_dTSel.C
index b4191c40e5..4972888719 100644
--- a/macro/beamtime/pl_all_dTSel.C
+++ b/macro/beamtime/pl_all_dTSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_dTSel.C
-  * @copyright Copyright (C) 2016-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_dTSel(Int_t iNSel = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ana_DTXY.C b/macro/beamtime/pl_ana_DTXY.C
index b8844b2c6f..9c5457adf5 100644
--- a/macro/beamtime/pl_ana_DTXY.C
+++ b/macro/beamtime/pl_ana_DTXY.C
@@ -1,6 +1,3 @@
-/** @file pl_ana_DTXY.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ana_DTXY(Int_t iDut = 901, Int_t NewNbinsX = 3, Int_t NewNbinsY = 3, Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ana_DXXY.C b/macro/beamtime/pl_ana_DXXY.C
index 34faec30cf..6f7e2effa0 100644
--- a/macro/beamtime/pl_ana_DXXY.C
+++ b/macro/beamtime/pl_ana_DXXY.C
@@ -1,6 +1,3 @@
-/** @file pl_ana_DXXY.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ana_DXXY(Int_t iDut = 901, Int_t NewNbinsX = 4, Int_t NewNbinsY = 4, Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ana_DYXY.C b/macro/beamtime/pl_ana_DYXY.C
index 4d6675db7c..5a917f55f9 100644
--- a/macro/beamtime/pl_ana_DYXY.C
+++ b/macro/beamtime/pl_ana_DYXY.C
@@ -1,6 +1,3 @@
-/** @file pl_ana_DYXY.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ana_DYXY(Int_t iDut = 901, Int_t NewNbinsX = 4, Int_t NewNbinsY = 4, Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_calib_trk.C b/macro/beamtime/pl_calib_trk.C
index 080c197763..eb8ff4269b 100644
--- a/macro/beamtime/pl_calib_trk.C
+++ b/macro/beamtime/pl_calib_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_calib_trk.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_calib_trk()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_cmp_1D.C b/macro/beamtime/pl_cmp_1D.C
index 80e0be42f7..048d60ca02 100644
--- a/macro/beamtime/pl_cmp_1D.C
+++ b/macro/beamtime/pl_cmp_1D.C
@@ -1,6 +1,3 @@
-/** @file pl_cmp_1D.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_cmp_1D(Int_t iOpt      = 1,
                TString fNameMC = "/home/nh/KRONOS/mc/mcbm/"
                                  "mcbm_beam_2019_03.agau.1.58gev.mbias.reco_hst.root",
diff --git a/macro/beamtime/pl_cmp_Eff.C b/macro/beamtime/pl_cmp_Eff.C
index 577cf88149..9057c2264a 100644
--- a/macro/beamtime/pl_cmp_Eff.C
+++ b/macro/beamtime/pl_cmp_Eff.C
@@ -1,6 +1,3 @@
-/** @file pl_cmp_Eff.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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_"
                                  "20161210_0646_DT50_Req1"
diff --git a/macro/beamtime/pl_cor_walk.C b/macro/beamtime/pl_cor_walk.C
index d59ac569e1..adcb7ec927 100644
--- a/macro/beamtime/pl_cor_walk.C
+++ b/macro/beamtime/pl_cor_walk.C
@@ -1,6 +1,4 @@
-/** @file pl_cor_walk.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void set_plot_style()
 {
   const Int_t NRGBs = 5;
diff --git a/macro/beamtime/pl_eff_XY.C b/macro/beamtime/pl_eff_XY.C
index a02848ada8..a9d0208b80 100644
--- a/macro/beamtime/pl_eff_XY.C
+++ b/macro/beamtime/pl_eff_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_eff_XY.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_eff_XY(Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ext_SUT.C b/macro/beamtime/pl_ext_SUT.C
index 99753a5a81..315bdda760 100644
--- a/macro/beamtime/pl_ext_SUT.C
+++ b/macro/beamtime/pl_ext_SUT.C
@@ -1,6 +1,3 @@
-/** @file pl_ext_SUT.C
-  * @copyright Copyright (C) 2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ext_SUT(Double_t dThr = 0., Double_t MinEff = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ext_dXdY.C b/macro/beamtime/pl_ext_dXdY.C
index fa10766923..809cdce7a3 100644
--- a/macro/beamtime/pl_ext_dXdY.C
+++ b/macro/beamtime/pl_ext_dXdY.C
@@ -1,6 +1,3 @@
-/** @file pl_ext_dXdY.C
-  * @copyright Copyright (C) 2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ext_dXdY(Int_t iLev = 0, Int_t NSt = 12)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ext_over.C b/macro/beamtime/pl_ext_over.C
index 18e93e05d3..da6f39a4c1 100644
--- a/macro/beamtime/pl_ext_over.C
+++ b/macro/beamtime/pl_ext_over.C
@@ -1,6 +1,3 @@
-/** @file pl_ext_over.C
-  * @copyright Copyright (C) 2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ext_over()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_ext_trk.C b/macro/beamtime/pl_ext_trk.C
index c1d75b67ff..e418240b59 100644
--- a/macro/beamtime/pl_ext_trk.C
+++ b/macro/beamtime/pl_ext_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_ext_trk.C
-  * @copyright Copyright (C) 2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ext_trk(Int_t iLev = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_Mat04D4best.C b/macro/beamtime/pl_over_Mat04D4best.C
index 1679f4452e..0231eaf7c4 100644
--- a/macro/beamtime/pl_over_Mat04D4best.C
+++ b/macro/beamtime/pl_over_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4best.C
-  * @copyright Copyright (C) 2016-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_MatD4sel.C b/macro/beamtime/pl_over_MatD4sel.C
index a5c64a0b16..933f3eb6b8 100644
--- a/macro/beamtime/pl_over_MatD4sel.C
+++ b/macro/beamtime/pl_over_MatD4sel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_MatD4sel.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_MatD4sel(TString sysinfo = "")
 {
   gROOT->LoadMacro(((TString) gSystem->Getenv("VMCWORKDIR") + "/macro/beamtime/pl_Datime.C").Data());
diff --git a/macro/beamtime/pl_over_Walk2.C b/macro/beamtime/pl_over_Walk2.C
index ce1d30e16d..ff37caa340 100644
--- a/macro/beamtime/pl_over_Walk2.C
+++ b/macro/beamtime/pl_over_Walk2.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Walk2.C
-  * @copyright Copyright (C) 2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_XX.C b/macro/beamtime/pl_over_XX.C
index 0809ed2268..0a5392d94d 100644
--- a/macro/beamtime/pl_over_XX.C
+++ b/macro/beamtime/pl_over_XX.C
@@ -1,6 +1,3 @@
-/** @file pl_over_XX.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/beamtime/pl_over_clu.C b/macro/beamtime/pl_over_clu.C
index 1e1b4aeb4c..85a014e1eb 100644
--- a/macro/beamtime/pl_over_clu.C
+++ b/macro/beamtime/pl_over_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_cluSel.C b/macro/beamtime/pl_over_cluSel.C
index a7fdd2310d..e6c3e47a27 100644
--- a/macro/beamtime/pl_over_cluSel.C
+++ b/macro/beamtime/pl_over_cluSel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cluSel.C
-  * @copyright Copyright (C) 2016-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_cor.C b/macro/beamtime/pl_over_cor.C
index e472e0348e..3f81ee24f9 100644
--- a/macro/beamtime/pl_over_cor.C
+++ b/macro/beamtime/pl_over_cor.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cor.C
-  * @copyright Copyright (C) 2017-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cor(Int_t SmT = 9, Int_t iSm = 0, Int_t iRpc = 0, Double_t yRange = 3.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_deltof.C b/macro/beamtime/pl_over_deltof.C
index e25a60140f..eaf3417617 100644
--- a/macro/beamtime/pl_over_deltof.C
+++ b/macro/beamtime/pl_over_deltof.C
@@ -1,6 +1,3 @@
-/** @file pl_over_deltof.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_deltof(Int_t iSel = 0, Int_t iNDet = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_get4.C b/macro/beamtime/pl_over_get4.C
index ea2579f27c..ab0d4ecfdc 100644
--- a/macro/beamtime/pl_over_get4.C
+++ b/macro/beamtime/pl_over_get4.C
@@ -1,6 +1,3 @@
-/** @file pl_over_get4.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_get4(Int_t nRoc = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_off.C b/macro/beamtime/pl_over_off.C
index 4f2e4deeba..64de652eb9 100644
--- a/macro/beamtime/pl_over_off.C
+++ b/macro/beamtime/pl_over_off.C
@@ -1,6 +1,3 @@
-/** @file pl_over_off.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_off(Int_t SmT = 6, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_pos.C b/macro/beamtime/pl_over_pos.C
index 7f752a1b0b..4c02c464c1 100644
--- a/macro/beamtime/pl_over_pos.C
+++ b/macro/beamtime/pl_over_pos.C
@@ -1,6 +1,3 @@
-/** @file pl_over_pos.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_pos(Int_t iNDet = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_toff.C b/macro/beamtime/pl_over_toff.C
index 102e14a900..0ec791797c 100644
--- a/macro/beamtime/pl_over_toff.C
+++ b/macro/beamtime/pl_over_toff.C
@@ -1,6 +1,3 @@
-/** @file pl_over_toff.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_toff(Int_t iSel = 0, Int_t iNDet = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_trk.C b/macro/beamtime/pl_over_trk.C
index 028cbdfd60..b383955457 100644
--- a/macro/beamtime/pl_over_trk.C
+++ b/macro/beamtime/pl_over_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trk.C
-  * @copyright Copyright (C) 2017-2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trk(Int_t NSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_pull_trk.C b/macro/beamtime/pl_pull_trk.C
index c6e5923871..592a61da17 100644
--- a/macro/beamtime/pl_pull_trk.C
+++ b/macro/beamtime/pl_pull_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_pull_trk.C
-  * @copyright Copyright (C) 2017-2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_pull_trk(Int_t NSt = 8, Int_t iVar = 0, Int_t iFit = 0, Int_t iDrop = -1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_rate_trkl.C b/macro/beamtime/pl_rate_trkl.C
index 6db95b365f..7b7ba5d0f3 100644
--- a/macro/beamtime/pl_rate_trkl.C
+++ b/macro/beamtime/pl_rate_trkl.C
@@ -1,6 +1,3 @@
-/** @file pl_rate_trkl.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_rate_trkl()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_raw_evt.C b/macro/beamtime/pl_raw_evt.C
index 0036dbc85d..cbd25861ec 100644
--- a/macro/beamtime/pl_raw_evt.C
+++ b/macro/beamtime/pl_raw_evt.C
@@ -1,6 +1,3 @@
-/** @file pl_raw_evt.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_raw_evt()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_rel_ratio.C b/macro/beamtime/pl_rel_ratio.C
index 42fa8681ec..f7ec7f10a7 100644
--- a/macro/beamtime/pl_rel_ratio.C
+++ b/macro/beamtime/pl_rel_ratio.C
@@ -1,6 +1,4 @@
-/** @file pl_rel_ratio.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void set_plot_style()
 {
   const Int_t NRGBs = 5;
diff --git a/macro/beamtime/pl_resi2D_trk.C b/macro/beamtime/pl_resi2D_trk.C
index 1b7f094f89..e02174af5f 100644
--- a/macro/beamtime/pl_resi2D_trk.C
+++ b/macro/beamtime/pl_resi2D_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_resi2D_trk.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_resi2D_trk(Int_t NSt = 8, Int_t iVar = 0, Int_t iFit = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_star_DigiCor.C b/macro/beamtime/pl_star_DigiCor.C
index ec49caa27c..8f40c2003e 100644
--- a/macro/beamtime/pl_star_DigiCor.C
+++ b/macro/beamtime/pl_star_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_star_DigiCor.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_star_DigiCor(Int_t iNDet = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_trk_Walk.C b/macro/beamtime/pl_trk_Walk.C
index 6c4b1aad6f..29a7d6882b 100644
--- a/macro/beamtime/pl_trk_Walk.C
+++ b/macro/beamtime/pl_trk_Walk.C
@@ -1,6 +1,3 @@
-/** @file pl_trk_Walk.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_trk_Walk(Int_t iId = 900, Int_t iOpt = 1, Double_t dMax = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_trk_cal_walk.C b/macro/beamtime/pl_trk_cal_walk.C
index 6b57f24a26..6cc74e7d4d 100644
--- a/macro/beamtime/pl_trk_cal_walk.C
+++ b/macro/beamtime/pl_trk_cal_walk.C
@@ -1,6 +1,3 @@
-/** @file pl_trk_cal_walk.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_trk_cal_walk(Int_t iType = 0, Int_t iSm = 0, Int_t iRpc = 0, Int_t iSide = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_vert_trk.C b/macro/beamtime/pl_vert_trk.C
index af68cdf880..04d8af38b0 100644
--- a/macro/beamtime/pl_vert_trk.C
+++ b/macro/beamtime/pl_vert_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_vert_trk.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_vert_trk(Double_t dFitWidth = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/save_hst.C b/macro/beamtime/save_hst.C
index 3ed0d9caf9..950c360bcc 100644
--- a/macro/beamtime/save_hst.C
+++ b/macro/beamtime/save_hst.C
@@ -1,6 +1,3 @@
-/** @file save_hst.C
-  * @copyright Copyright (C) 2017-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_hst(TString cstr = "status.hst.root", Bool_t bROOT = kTRUE)
 {
   cout << "save all histograms to file " << cstr.Data() << endl;
diff --git a/macro/beamtime/star2017/ana_digi.C b/macro/beamtime/star2017/ana_digi.C
index fdbd071aff..05ab8138e5 100644
--- a/macro/beamtime/star2017/ana_digi.C
+++ b/macro/beamtime/star2017/ana_digi.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
               Int_t iSel2 = 0, Double_t dDeadtime = 50.)
diff --git a/macro/beamtime/star2017/ana_digi_cal.C b/macro/beamtime/star2017/ana_digi_cal.C
index 6dd4d3d71a..3a024914b5 100644
--- a/macro/beamtime/star2017/ana_digi_cal.C
+++ b/macro/beamtime/star2017/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
                   Int_t iSel2 = 0, Double_t dDeadtime = 50.)
diff --git a/macro/beamtime/star2017/dis_digi.C b/macro/beamtime/star2017/dis_digi.C
index 758c0a42f4..b1c01291aa 100644
--- a/macro/beamtime/star2017/dis_digi.C
+++ b/macro/beamtime/star2017/dis_digi.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
               Double_t dDeadtime = 50., Int_t iGenCor = 1, Int_t iTrackingSetup = 0, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C b/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C
index bb4e92e769..ed5f98168d 100644
--- a/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluMemMulDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/pl_all_CluMul.C b/macro/beamtime/star2017/pl_all_CluMul.C
index 589794c07c..79d081ffd8 100644
--- a/macro/beamtime/star2017/pl_all_CluMul.C
+++ b/macro/beamtime/star2017/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluMul(Int_t iNSt = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/pl_all_CluRate.C b/macro/beamtime/star2017/pl_all_CluRate.C
index fb44df27f9..4a6eaf6524 100644
--- a/macro/beamtime/star2017/pl_all_CluRate.C
+++ b/macro/beamtime/star2017/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluRate(Int_t iNSt = 2, Double_t Tstart = 0., Double_t Tend = 3600.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C b/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C
index 2136313e0d..a5eb60b8d3 100644
--- a/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluSizeDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/pl_all_DTLastHits.C b/macro/beamtime/star2017/pl_all_DTLastHits.C
index 4917825c3b..85ac4fc8a3 100644
--- a/macro/beamtime/star2017/pl_all_DTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_DTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_DTLastHits(Int_t iNSt = 2, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/pl_all_TOffDTLastHits.C b/macro/beamtime/star2017/pl_all_TOffDTLastHits.C
index 2fc1fb56a2..244f93e6d0 100644
--- a/macro/beamtime/star2017/pl_all_TOffDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_TOffDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_TOffDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/pl_all_TotDTLastHits.C b/macro/beamtime/star2017/pl_all_TotDTLastHits.C
index 204058fb74..8fe0cf2163 100644
--- a/macro/beamtime/star2017/pl_all_TotDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_TotDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_TotDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2017/rootlogon.C b/macro/beamtime/star2017/rootlogon.C
index 8f57cac5e5..d041dcce9a 100644
--- a/macro/beamtime/star2017/rootlogon.C
+++ b/macro/beamtime/star2017/rootlogon.C
@@ -1,8 +1,6 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
 }
+
 void rootlogon_nh()
 {
   pTime = new TDatime();
diff --git a/macro/beamtime/star2018/ana_digi.C b/macro/beamtime/star2018/ana_digi.C
index fdbd071aff..05ab8138e5 100644
--- a/macro/beamtime/star2018/ana_digi.C
+++ b/macro/beamtime/star2018/ana_digi.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
               Int_t iSel2 = 0, Double_t dDeadtime = 50.)
diff --git a/macro/beamtime/star2018/ana_digi_cal.C b/macro/beamtime/star2018/ana_digi_cal.C
index 6dd4d3d71a..3a024914b5 100644
--- a/macro/beamtime/star2018/ana_digi_cal.C
+++ b/macro/beamtime/star2018/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
                   Int_t iSel2 = 0, Double_t dDeadtime = 50.)
diff --git a/macro/beamtime/star2018/dis_digi.C b/macro/beamtime/star2018/dis_digi.C
index 758c0a42f4..b1c01291aa 100644
--- a/macro/beamtime/star2018/dis_digi.C
+++ b/macro/beamtime/star2018/dis_digi.C
@@ -1,6 +1,3 @@
-/** @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 **/
 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,
               Double_t dDeadtime = 50., Int_t iGenCor = 1, Int_t iTrackingSetup = 0, Double_t dScalFac = 5.,
diff --git a/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C b/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C
index bb4e92e769..ed5f98168d 100644
--- a/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluMemMulDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/pl_all_CluMul.C b/macro/beamtime/star2018/pl_all_CluMul.C
index 589794c07c..79d081ffd8 100644
--- a/macro/beamtime/star2018/pl_all_CluMul.C
+++ b/macro/beamtime/star2018/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluMul(Int_t iNSt = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/pl_all_CluRate.C b/macro/beamtime/star2018/pl_all_CluRate.C
index fb44df27f9..4a6eaf6524 100644
--- a/macro/beamtime/star2018/pl_all_CluRate.C
+++ b/macro/beamtime/star2018/pl_all_CluRate.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluRate(Int_t iNSt = 2, Double_t Tstart = 0., Double_t Tend = 3600.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C b/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C
index 2136313e0d..a5eb60b8d3 100644
--- a/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_CluSizeDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/pl_all_DTLastHits.C b/macro/beamtime/star2018/pl_all_DTLastHits.C
index 4917825c3b..85ac4fc8a3 100644
--- a/macro/beamtime/star2018/pl_all_DTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_DTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_DTLastHits(Int_t iNSt = 2, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/pl_all_TOffDTLastHits.C b/macro/beamtime/star2018/pl_all_TOffDTLastHits.C
index 2fc1fb56a2..244f93e6d0 100644
--- a/macro/beamtime/star2018/pl_all_TOffDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_TOffDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_TOffDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/pl_all_TotDTLastHits.C b/macro/beamtime/star2018/pl_all_TotDTLastHits.C
index 204058fb74..8fe0cf2163 100644
--- a/macro/beamtime/star2018/pl_all_TotDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_TotDTLastHits.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_TotDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/star2018/rootlogon.C b/macro/beamtime/star2018/rootlogon.C
index 8f57cac5e5..d041dcce9a 100644
--- a/macro/beamtime/star2018/rootlogon.C
+++ b/macro/beamtime/star2018/rootlogon.C
@@ -1,8 +1,6 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
 }
+
 void rootlogon_nh()
 {
   pTime = new TDatime();
diff --git a/macro/beamtime/star2019/inspect_latency_histo.C b/macro/beamtime/star2019/inspect_latency_histo.C
index c8d0ece71d..66f8912602 100644
--- a/macro/beamtime/star2019/inspect_latency_histo.C
+++ b/macro/beamtime/star2019/inspect_latency_histo.C
@@ -1,6 +1,3 @@
-/** @file inspect_latency_histo.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void inspect_latency_histo(Double_t dLat = 0, TString hFile = "data/HistosMonitorTofSync.root")
 {
   using namespace std;
diff --git a/macro/beamtime/star2019/inspect_shift_histo.C b/macro/beamtime/star2019/inspect_shift_histo.C
index 3e3a3a461b..b3ca5ed8ff 100644
--- a/macro/beamtime/star2019/inspect_shift_histo.C
+++ b/macro/beamtime/star2019/inspect_shift_histo.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void inspect_shift_histo(TString hFile = "data/HistosMonitorTofSync.root")
 {
   using namespace std;
diff --git a/macro/beamtime/star2019/inspect_sync_histo.C b/macro/beamtime/star2019/inspect_sync_histo.C
index 1a8b3f72bf..fd2b6e4acc 100644
--- a/macro/beamtime/star2019/inspect_sync_histo.C
+++ b/macro/beamtime/star2019/inspect_sync_histo.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void inspect_sync_histo(TString hFile = "data/HistosMonitorTofSync.root", Double_t MaxMismatch = 1.)
 {
   using namespace std;
diff --git a/macro/beamtime/tests/TofCernFeb15Calib.C b/macro/beamtime/tests/TofCernFeb15Calib.C
index 929f7f66b3..39bbb21664 100644
--- a/macro/beamtime/tests/TofCernFeb15Calib.C
+++ b/macro/beamtime/tests/TofCernFeb15Calib.C
@@ -1,7 +1,5 @@
-/** @file TofCernFeb15Calib.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "tof_feb15_setup_unpack.C"
+
 void TofCernFeb15Calib(Int_t nEvents = 10000)
 {
   TString outDir = "data/";
diff --git a/macro/beamtime/tests/TofCernFeb15Run.C b/macro/beamtime/tests/TofCernFeb15Run.C
index 8fa30cb746..c143c82730 100644
--- a/macro/beamtime/tests/TofCernFeb15Run.C
+++ b/macro/beamtime/tests/TofCernFeb15Run.C
@@ -1,6 +1,4 @@
-/** @file TofCernFeb15Run.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void TofCernFeb15Run(Int_t nEvents = 2)
 {
   TString outDir = "data/";
diff --git a/macro/beamtime/tests/TofCernNov15Calib.C b/macro/beamtime/tests/TofCernNov15Calib.C
index b823f32988..c76ca1a074 100644
--- a/macro/beamtime/tests/TofCernNov15Calib.C
+++ b/macro/beamtime/tests/TofCernNov15Calib.C
@@ -1,7 +1,5 @@
-/** @file TofCernNov15Calib.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "tof_nov15_setup_unpack.C"
+
 void TofCernNov15Calib(Int_t nEvents = 10000)
 {
   TString outDir = "data/";
diff --git a/macro/beamtime/tests/TofCernNov15Run.C b/macro/beamtime/tests/TofCernNov15Run.C
index b916ae2656..1056345d43 100644
--- a/macro/beamtime/tests/TofCernNov15Run.C
+++ b/macro/beamtime/tests/TofCernNov15Run.C
@@ -1,6 +1,4 @@
-/** @file TofCernNov15Run.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void TofCernNov15Run(Int_t nEvents = 2)
 {
   TString outDir = "data/";
diff --git a/macro/dimuon/invM.C b/macro/dimuon/invM.C
index 2935b365fd..f7e17979b6 100644
--- a/macro/dimuon/invM.C
+++ b/macro/dimuon/invM.C
@@ -1,6 +1,3 @@
-/** @file invM.C
-  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //---------------------------------------------------
 //
 // Anna Senger a.senger@gsi.de
diff --git a/macro/ecal/run_reco.C b/macro/ecal/run_reco.C
index 09f313a7d2..b26c2f75d8 100644
--- a/macro/ecal/run_reco.C
+++ b/macro/ecal/run_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/ecal/run_sim.C b/macro/ecal/run_sim.C
index 84c32cd3d0..33ef5a3bfb 100644
--- a/macro/ecal/run_sim.C
+++ b/macro/ecal/run_sim.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/fhodo/Create_mapping_parameters.C b/macro/fhodo/Create_mapping_parameters.C
index 36974928ec..fdcceeafb3 100644
--- a/macro/fhodo/Create_mapping_parameters.C
+++ b/macro/fhodo/Create_mapping_parameters.C
@@ -1,8 +1,6 @@
-/** @file Create_mapping_parameters.C
-  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void Create_mapping_parameters()
 {
+
   FairLogger::GetLogger();
   // This code was copied from the Go4 analysis used for previous beamtimes
   // The original maping was developed by Christian Pauli
diff --git a/macro/field/FieldMapTest.C b/macro/field/FieldMapTest.C
index 67292cc82d..fc36e1176d 100644
--- a/macro/field/FieldMapTest.C
+++ b/macro/field/FieldMapTest.C
@@ -1,6 +1,3 @@
-/** @file FieldMapTest.C
-  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for automatic check of a magnetic field map.
diff --git a/macro/field/checkFieldMap.C b/macro/field/checkFieldMap.C
index acbe8c3b4f..b1a4223ee8 100644
--- a/macro/field/checkFieldMap.C
+++ b/macro/field/checkFieldMap.C
@@ -1,6 +1,3 @@
-/** @file checkFieldMap.C
-  * @copyright Copyright (C) 2007-2013 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for check of a magnetic field map
diff --git a/macro/field/checkFieldSym.C b/macro/field/checkFieldSym.C
index b468d01e3a..df744194e6 100644
--- a/macro/field/checkFieldSym.C
+++ b/macro/field/checkFieldSym.C
@@ -1,6 +1,3 @@
-/** @file checkFieldSym.C
-  * @copyright Copyright (C) 2007-2009 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for check of the symmetries of a magnetic field map
diff --git a/macro/field/checkFields.C b/macro/field/checkFields.C
index 17541f8412..85183dac16 100644
--- a/macro/field/checkFields.C
+++ b/macro/field/checkFields.C
@@ -1,6 +1,3 @@
-/** @file checkFields.C
-  * @copyright Copyright (C) 2007-2009 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 f2d5d815d2..5a7faac979 100644
--- a/macro/field/createDistorted.C
+++ b/macro/field/createDistorted.C
@@ -1,7 +1,6 @@
-/** @file createDistorted.C
-  * @copyright Copyright (C) 2008 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 {
+
   // ----------   Load libraries   ------------------------------------------
   gROOT->LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C");
   basiclibs();
diff --git a/macro/field/createFieldMap.C b/macro/field/createFieldMap.C
index e20dd10fbb..f0946699e1 100644
--- a/macro/field/createFieldMap.C
+++ b/macro/field/createFieldMap.C
@@ -1,6 +1,3 @@
-/** @file createFieldMap.C
-  * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // This macro allows to create a field map out of an arbitrary number
diff --git a/macro/field/drawField.C b/macro/field/drawField.C
index 94595e0df8..16fe0baa7c 100644
--- a/macro/field/drawField.C
+++ b/macro/field/drawField.C
@@ -1,9 +1,7 @@
-/** @file drawField.C
-  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void drawField()
 {
 
+
   TString fieldName = "field_v12b";
   Double_t fzmin    = -300.;  // along z axis
   Double_t fzmax    = 300.;
diff --git a/macro/fles/PlotChRate.C b/macro/fles/PlotChRate.C
index 0fb1c9cdd8..3ef7f6c962 100644
--- a/macro/fles/PlotChRate.C
+++ b/macro/fles/PlotChRate.C
@@ -1,6 +1,3 @@
-/** @file PlotChRate.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   Int_t iNbGet4 = 48;
   TH2D* pGet4Histos[iNbGet4];
diff --git a/macro/fles/PlotEventBuilder.C b/macro/fles/PlotEventBuilder.C
index abf823c591..4f057b6d6b 100644
--- a/macro/fles/PlotEventBuilder.C
+++ b/macro/fles/PlotEventBuilder.C
@@ -1,6 +1,3 @@
-/** @file PlotEventBuilder.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cEventBuilder = new TCanvas("cEventBuilder", "EventBuilder");
   cEventBuilder->Divide(2);
diff --git a/macro/fles/PlotMap.C b/macro/fles/PlotMap.C
index 7625e46175..f56ed7f3d8 100644
--- a/macro/fles/PlotMap.C
+++ b/macro/fles/PlotMap.C
@@ -1,6 +1,4 @@
-/** @file PlotMap.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 {
   TCanvas* c2 = new TCanvas("c2", "c2s");
   c2->Divide(5, 5);
diff --git a/macro/fles/PlotTimeEvo.C b/macro/fles/PlotTimeEvo.C
index a1d6d03efe..5e3ad8a7c6 100644
--- a/macro/fles/PlotTimeEvo.C
+++ b/macro/fles/PlotTimeEvo.C
@@ -1,6 +1,3 @@
-/** @file PlotTimeEvo.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   Double_t dStartTime = 0.0;
   Double_t dStopTime  = 400.0;
diff --git a/macro/fles/call_Tsa_client.C b/macro/fles/call_Tsa_client.C
index 9ddec115fa..f04671a138 100644
--- a/macro/fles/call_Tsa_client.C
+++ b/macro/fles/call_Tsa_client.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void call_Tsa_client(Int_t nMin = 1)
 {
   Int_t nEvents      = nMin * 60 * 10;  //minutes * seconds * 10Hz TimeSlices
diff --git a/macro/fles/call_Tsa_client_Cruz.C b/macro/fles/call_Tsa_client_Cruz.C
index 87779c89f5..dedfe43ca2 100644
--- a/macro/fles/call_Tsa_client_Cruz.C
+++ b/macro/fles/call_Tsa_client_Cruz.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void call_Tsa_client_Cruz(Int_t nMin = 1)
 {
   Int_t nEvents      = nMin * 60 * 10;  //minutes * seconds * 10Hz TimeSlices
diff --git a/macro/fles/data/readHistosFromFile.C b/macro/fles/data/readHistosFromFile.C
index 80a6c7615d..f6fd87ab5b 100644
--- a/macro/fles/data/readHistosFromFile.C
+++ b/macro/fles/data/readHistosFromFile.C
@@ -1,6 +1,4 @@
-/** @file readHistosFromFile.C
-  * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TCanvas.h"
 #include "TFile.h"
 #include "TH1.h"
diff --git a/macro/fles/get4/PlotChRate.C b/macro/fles/get4/PlotChRate.C
index 2234be1366..d6a49871af 100644
--- a/macro/fles/get4/PlotChRate.C
+++ b/macro/fles/get4/PlotChRate.C
@@ -1,6 +1,3 @@
-/** @file PlotChRate.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   Int_t iNbGet4 = 48;
   TH2D* pGet4Histos[iNbGet4];
diff --git a/macro/fles/get4/PlotEpochJumps.C b/macro/fles/get4/PlotEpochJumps.C
index efcfa4f388..b5500d4779 100644
--- a/macro/fles/get4/PlotEpochJumps.C
+++ b/macro/fles/get4/PlotEpochJumps.C
@@ -1,6 +1,3 @@
-/** @file PlotEpochJumps.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cEpJumpChips = new TCanvas("cEpJumpChips", "Epoch Jumps CT chips");
   cEpJumpChips->Divide(2, 4);
diff --git a/macro/fles/get4/PlotEventBuilder.C b/macro/fles/get4/PlotEventBuilder.C
index abf823c591..4f057b6d6b 100644
--- a/macro/fles/get4/PlotEventBuilder.C
+++ b/macro/fles/get4/PlotEventBuilder.C
@@ -1,6 +1,3 @@
-/** @file PlotEventBuilder.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cEventBuilder = new TCanvas("cEventBuilder", "EventBuilder");
   cEventBuilder->Divide(2);
diff --git a/macro/fles/get4/PlotFtEdgesRatio.C b/macro/fles/get4/PlotFtEdgesRatio.C
index 992a7356c3..4cadf0f4bd 100644
--- a/macro/fles/get4/PlotFtEdgesRatio.C
+++ b/macro/fles/get4/PlotFtEdgesRatio.C
@@ -1,6 +1,5 @@
-/** @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 **/
+
+
 //   hPulserFeeDnl->Draw("colz");
 
 //   hPulserFeeTotDnl->Draw("colz");
diff --git a/macro/fles/get4/PlotMap.C b/macro/fles/get4/PlotMap.C
index 7625e46175..f56ed7f3d8 100644
--- a/macro/fles/get4/PlotMap.C
+++ b/macro/fles/get4/PlotMap.C
@@ -1,6 +1,4 @@
-/** @file PlotMap.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 {
   TCanvas* c2 = new TCanvas("c2", "c2s");
   c2->Divide(5, 5);
diff --git a/macro/fles/get4/PlotMultiDet.C b/macro/fles/get4/PlotMultiDet.C
index faecbd4274..7e0454633c 100644
--- a/macro/fles/get4/PlotMultiDet.C
+++ b/macro/fles/get4/PlotMultiDet.C
@@ -1,7 +1,5 @@
-/** @file PlotMultiDet.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
+
   TCanvas* cHDP2 = new TCanvas("cHDP2", "HDP2");
   cHDP2->Divide(4, 4);
 
diff --git a/macro/fles/get4/PlotMultiDetDist.C b/macro/fles/get4/PlotMultiDetDist.C
index 0f4be45176..6d8e157807 100644
--- a/macro/fles/get4/PlotMultiDetDist.C
+++ b/macro/fles/get4/PlotMultiDetDist.C
@@ -1,7 +1,5 @@
-/** @file PlotMultiDetDist.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
+
   TCanvas* cHDP2 = new TCanvas("cHDP2", "HDP2");
   cHDP2->Divide(4, 4);
 
diff --git a/macro/fles/get4/PlotMultiDetTot.C b/macro/fles/get4/PlotMultiDetTot.C
index 6213707590..aa2eb645bb 100644
--- a/macro/fles/get4/PlotMultiDetTot.C
+++ b/macro/fles/get4/PlotMultiDetTot.C
@@ -1,7 +1,5 @@
-/** @file PlotMultiDetTot.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
+
   TCanvas* cHDP2 = new TCanvas("cHDP2", "HDP2");
   cHDP2->Divide(4, 4);
 
diff --git a/macro/fles/get4/PlotPulsCt.C b/macro/fles/get4/PlotPulsCt.C
index a27cb5dcb1..079b4fe4d4 100644
--- a/macro/fles/get4/PlotPulsCt.C
+++ b/macro/fles/get4/PlotPulsCt.C
@@ -1,6 +1,3 @@
-/** @file PlotPulsCt.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cCtChipsA = new TCanvas("cCtChipsA", "CT distributions for chips 0-3 in FEE A");
   cCtChipsA->Divide(2, 2);
diff --git a/macro/fles/get4/PlotPulsDist.C b/macro/fles/get4/PlotPulsDist.C
index bac0f0c5c9..74dff0924c 100644
--- a/macro/fles/get4/PlotPulsDist.C
+++ b/macro/fles/get4/PlotPulsDist.C
@@ -1,6 +1,3 @@
-/** @file PlotPulsDist.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cPulserDistNs = new TCanvas("cPulserDistNs", "Pulses time interval, ns range");
   cPulserDistNs->cd();
diff --git a/macro/fles/get4/PlotPulsFtDt.C b/macro/fles/get4/PlotPulsFtDt.C
index 16503abd34..ca725dcef7 100644
--- a/macro/fles/get4/PlotPulsFtDt.C
+++ b/macro/fles/get4/PlotPulsFtDt.C
@@ -1,6 +1,3 @@
-/** @file PlotPulsFtDt.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   /*
    TCanvas *cFtDtTime= new TCanvas("cFtDtTime", "Time edge FT for big and small dt");
diff --git a/macro/fles/get4/PlotPulsMulti.C b/macro/fles/get4/PlotPulsMulti.C
index 1eb90d0705..a39a8f29b9 100644
--- a/macro/fles/get4/PlotPulsMulti.C
+++ b/macro/fles/get4/PlotPulsMulti.C
@@ -1,6 +1,3 @@
-/** @file PlotPulsMulti.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cRoc0Fee01 = new TCanvas("cRoc0Fee01", "cRoc0Fee01");
   cRoc0Fee01->Divide(4, 4);
diff --git a/macro/fles/get4/PlotPulsMultiDist.C b/macro/fles/get4/PlotPulsMultiDist.C
index 5f3b83c2ef..a153ac816d 100644
--- a/macro/fles/get4/PlotPulsMultiDist.C
+++ b/macro/fles/get4/PlotPulsMultiDist.C
@@ -1,6 +1,3 @@
-/** @file PlotPulsMultiDist.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cRoc0Fee01DistD = new TCanvas("cRoc0Fee01DistD", "cRoc0Fee01 Double hits distance");
   cRoc0Fee01DistD->Divide(4, 4);
diff --git a/macro/fles/get4/PlotPulsMultiTot.C b/macro/fles/get4/PlotPulsMultiTot.C
index fa45da1684..fd23308583 100644
--- a/macro/fles/get4/PlotPulsMultiTot.C
+++ b/macro/fles/get4/PlotPulsMultiTot.C
@@ -1,6 +1,3 @@
-/** @file PlotPulsMultiTot.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TCanvas* cRoc0Fee01Tot = new TCanvas("cRoc0Fee01Tot", "cRoc0Fee01 Multiple hits as function of TOT");
   cRoc0Fee01Tot->Divide(4, 4);
diff --git a/macro/fles/get4/PlotPulsRes.C b/macro/fles/get4/PlotPulsRes.C
index d2c8a55ad5..d506eea52e 100644
--- a/macro/fles/get4/PlotPulsRes.C
+++ b/macro/fles/get4/PlotPulsRes.C
@@ -1,6 +1,4 @@
-/** @file PlotPulsRes.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 {
   TCanvas* cFeeRms = new TCanvas("cFeeRms", "Fee RMS");
   cFeeRms->cd();
diff --git a/macro/fles/get4/PlotPulsResEnc.C b/macro/fles/get4/PlotPulsResEnc.C
index 0e88d72a4a..f46893e3ef 100644
--- a/macro/fles/get4/PlotPulsResEnc.C
+++ b/macro/fles/get4/PlotPulsResEnc.C
@@ -1,6 +1,4 @@
-/** @file PlotPulsResEnc.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 {
   const UInt_t kuNbChanMax  = 32 * 4 + 32 * 4 + 32 * 4;  // 4 FEE/ROC in hardware + 4 FEE/ROC only in software, 2 ROCS
   const UInt_t kuNbChanTest = 16;
diff --git a/macro/fles/get4/PlotPulsResTot.C b/macro/fles/get4/PlotPulsResTot.C
index 7e06c1eb1c..f11614b32b 100644
--- a/macro/fles/get4/PlotPulsResTot.C
+++ b/macro/fles/get4/PlotPulsResTot.C
@@ -1,6 +1,4 @@
-/** @file PlotPulsResTot.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 {
   const UInt_t kuNbChanMax  = 32 * 4 + 32 * 4 + 32 * 4;  // 4 FEE/ROC in hardware + 4 FEE/ROC only in software, 2 ROCS
   const UInt_t kuNbChanTest = 16;
diff --git a/macro/fles/get4/PlotTimeEvo.C b/macro/fles/get4/PlotTimeEvo.C
index 3d406d027e..2fe043486f 100644
--- a/macro/fles/get4/PlotTimeEvo.C
+++ b/macro/fles/get4/PlotTimeEvo.C
@@ -1,6 +1,3 @@
-/** @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 **/
 {
   Double_t dStartTime = 0.0;
   Double_t dStopTime  = 400.0;
diff --git a/macro/fles/get4/rootlogon.C b/macro/fles/get4/rootlogon.C
index b3a90f5106..01ea59afd9 100644
--- a/macro/fles/get4/rootlogon.C
+++ b/macro/fles/get4/rootlogon.C
@@ -1,6 +1,3 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   cout << " Executing rootlogon.C (nh)" << endl;
   gStyle->SetOptStat(111);
diff --git a/macro/fles/readNxTsa.C b/macro/fles/readNxTsa.C
index 5dc7d128ed..cf77148c07 100644
--- a/macro/fles/readNxTsa.C
+++ b/macro/fles/readNxTsa.C
@@ -1,8 +1,6 @@
-/** @file readNxTsa.C
-  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void readNxTsa()
 {
+
   // --- Specify input file name (this is just an example)
   TString inFile = "nxdata.tsa";
 
diff --git a/macro/fles/readTsaFexOffline.C b/macro/fles/readTsaFexOffline.C
index 2fc38f0850..dd8e64731d 100644
--- a/macro/fles/readTsaFexOffline.C
+++ b/macro/fles/readTsaFexOffline.C
@@ -1,6 +1,5 @@
-/** @file readTsaFexOffline.C
-  * @copyright Copyright (C) 2017 Institute for Computer Science, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void readTsaFexOffline(TString inFile =
                          //"data/43_sps2016.tsa"
                        //"/Users/fairbanks/fairbanks/dev/data/tsa/14_debug_spadic1p1.tsa"
diff --git a/macro/fles/readTsaTimeOffline.C b/macro/fles/readTsaTimeOffline.C
index f51740b53c..12a2710269 100644
--- a/macro/fles/readTsaTimeOffline.C
+++ b/macro/fles/readTsaTimeOffline.C
@@ -1,6 +1,3 @@
-/** @file readTsaTimeOffline.C
-  * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void readTsaTimeOffline(TString inFile =
                           //"data/98_ba2015.tsa"
                         //"data/129_ba2015.tsa"
diff --git a/macro/fles/readTsa_file_stsxyter.C b/macro/fles/readTsa_file_stsxyter.C
index 8ede6b1272..d15e4a010e 100644
--- a/macro/fles/readTsa_file_stsxyter.C
+++ b/macro/fles/readTsa_file_stsxyter.C
@@ -1,6 +1,4 @@
-/** @file readTsa_file_stsxyter.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void readTsa_file_stsxyter(TString inFile = "stsxdata.tsa")
 {
   Int_t nEvents   = 1815;
diff --git a/macro/generators/run_CbmIonGenerator.C b/macro/generators/run_CbmIonGenerator.C
index 480bae423d..984ad2da79 100644
--- a/macro/generators/run_CbmIonGenerator.C
+++ b/macro/generators/run_CbmIonGenerator.C
@@ -1,6 +1,3 @@
-/** @file run_CbmIonGenerator.C
-  * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_CbmIonGenerator(Int_t nEvents = 1)
 {
   // ========================================================================
diff --git a/macro/generators/run_pluto.C b/macro/generators/run_pluto.C
index 0b5db857cb..650b3e7e51 100644
--- a/macro/generators/run_pluto.C
+++ b/macro/generators/run_pluto.C
@@ -1,6 +1,3 @@
-/** @file run_pluto.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro for running Cbm  with Geant3  or Geant4 (M. Al-Turany , D. Bertini)
 // Modified 22/06/2005 D.Bertini
 run_pluto(Int_t pluto_example = 1)
diff --git a/macro/geometry/check_media.C b/macro/geometry/check_media.C
index b946acd73b..44b107fa7b 100644
--- a/macro/geometry/check_media.C
+++ b/macro/geometry/check_media.C
@@ -1,6 +1,3 @@
-/** @file check_media.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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
 // different detector systems.
diff --git a/macro/geometry/create_medialist.C b/macro/geometry/create_medialist.C
index a3b4ab9981..699979b84a 100644
--- a/macro/geometry/create_medialist.C
+++ b/macro/geometry/create_medialist.C
@@ -1,8 +1,6 @@
-/** @file create_medialist.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //forward declaration
 void loop_over_nodes(TObjArray*, TString&, CbmMediaList&);
+
 void create_medialist(TString inFileName = "")
 {
 
diff --git a/macro/geometry/create_positionlist.C b/macro/geometry/create_positionlist.C
index b73ab56d15..f06082aa18 100644
--- a/macro/geometry/create_positionlist.C
+++ b/macro/geometry/create_positionlist.C
@@ -1,8 +1,6 @@
-/** @file create_positionlist.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //forward declaration
 void loop_over_nodes(TObjArray*, TString&, std::map<TString, TVector3>&);
+
 void create_positionlist(TString inFileName = "")
 {
 
diff --git a/macro/geometry/print_medialist.C b/macro/geometry/print_medialist.C
index f7a183f1be..4a5cc6bc73 100644
--- a/macro/geometry/print_medialist.C
+++ b/macro/geometry/print_medialist.C
@@ -1,8 +1,6 @@
-/** @file print_medialist.C
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void print_medialist(TString fileName)
 {
+
   cout << "Open file " << fileName << endl;
   TFile* infile = TFile::Open(fileName);
   if (!infile->IsOpen()) {
diff --git a/macro/global/Merger.C b/macro/global/Merger.C
index 53a83db204..fe8e299736 100644
--- a/macro/global/Merger.C
+++ b/macro/global/Merger.C
@@ -1,7 +1,5 @@
-/** @file Merger.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro for merging of STS and TRD tracks and TOF hits
+
 {
   TStopwatch timer;
   timer.Start();
diff --git a/macro/hadron/acceptance.C b/macro/hadron/acceptance.C
index df884c0968..0fffd41ccf 100644
--- a/macro/hadron/acceptance.C
+++ b/macro/hadron/acceptance.C
@@ -1,7 +1,6 @@
-/** @file acceptance.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "/u/kresan/cbm/trunk_feb12/cbmroot/cbmbase/CbmDetectorList.h"
+
 #include "drawStyle.C"
 
 
diff --git a/macro/hadron/draw.C b/macro/hadron/draw.C
index 1e03f90313..a3037c2f93 100644
--- a/macro/hadron/draw.C
+++ b/macro/hadron/draw.C
@@ -1,6 +1,3 @@
-/** @file draw.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define MPION 0.1395700
 #define MKAON 0.493677
 #define MPROT 0.938272
diff --git a/macro/hadron/drawStyle.C b/macro/hadron/drawStyle.C
index cd7e992667..6450534595 100644
--- a/macro/hadron/drawStyle.C
+++ b/macro/hadron/drawStyle.C
@@ -1,9 +1,7 @@
-/** @file drawStyle.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // drawStyle.C
 // Set the drawing style of different objects
 
+
 void Style(TH2* h, const char* xTitle, const char* yTitle)
 {
   h->GetXaxis()->SetTitle(xTitle);
diff --git a/macro/hadron/draw_reco.C b/macro/hadron/draw_reco.C
index 8b2350af37..e729046734 100644
--- a/macro/hadron/draw_reco.C
+++ b/macro/hadron/draw_reco.C
@@ -1,7 +1,6 @@
-/** @file draw_reco.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "drawStyle.C"
+
+
 void plot_sts()
 {
   TPstyle();
diff --git a/macro/hadron/draw_run.C b/macro/hadron/draw_run.C
index 48158cfae4..a139a68cf0 100644
--- a/macro/hadron/draw_run.C
+++ b/macro/hadron/draw_run.C
@@ -1,7 +1,5 @@
-/** @file draw_run.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "drawStyle.C"
+
 void plot()
 {
   TPstyle();
diff --git a/macro/hadron/fillm2.C b/macro/hadron/fillm2.C
index 9932e5c1f4..569f335e61 100644
--- a/macro/hadron/fillm2.C
+++ b/macro/hadron/fillm2.C
@@ -1,6 +1,4 @@
-/** @file fillm2.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void fillm2(Float_t beamMomentum, Float_t timeResolution, Int_t level)
 {
   if (level < 1 || level > 2) return;
diff --git a/macro/hadron/fitm2.C b/macro/hadron/fitm2.C
index 8ee2d7107e..d1d8262b72 100644
--- a/macro/hadron/fitm2.C
+++ b/macro/hadron/fitm2.C
@@ -1,6 +1,4 @@
-/** @file fitm2.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void fitm2(Float_t beamMomentum, Float_t timeResolution, Float_t purity, Int_t level)
 {
   if (level < 1 || level > 3) return;
diff --git a/macro/hadron/produceDst.C b/macro/hadron/produceDst.C
index 17af20fabd..f5fabe2b3a 100644
--- a/macro/hadron/produceDst.C
+++ b/macro/hadron/produceDst.C
@@ -1,6 +1,4 @@
-/** @file produceDst.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void produceDst(Float_t beamMomentum, Int_t index)
 {
   TStopwatch timer;
diff --git a/macro/hadron/reco.urqmd.C b/macro/hadron/reco.urqmd.C
index 020a64babb..8d0e859d55 100644
--- a/macro/hadron/reco.urqmd.C
+++ b/macro/hadron/reco.urqmd.C
@@ -1,6 +1,4 @@
-/** @file reco.urqmd.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void reco_urqmd(Int_t index)
 {
   TStopwatch timer;
diff --git a/macro/hadron/run.urqmd.C b/macro/hadron/run.urqmd.C
index 03e95af6e4..e63bd50c70 100644
--- a/macro/hadron/run.urqmd.C
+++ b/macro/hadron/run.urqmd.C
@@ -1,6 +1,4 @@
-/** @file run.urqmd.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_urqmd(Float_t beamMomentum, Int_t index)
 {
   TStopwatch timer;
diff --git a/macro/hadron/spectra.urqmd.C b/macro/hadron/spectra.urqmd.C
index d146be98a8..4e64967174 100644
--- a/macro/hadron/spectra.urqmd.C
+++ b/macro/hadron/spectra.urqmd.C
@@ -1,6 +1,4 @@
-/** @file spectra.urqmd.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void spectra_urqmd(Float_t beamMomentum, Float_t timeResolution, Float_t purity)
 {
   // Load libraries
diff --git a/macro/hadron/yields.urqmd.C b/macro/hadron/yields.urqmd.C
index b4bd1589fb..ee7d5fb6df 100644
--- a/macro/hadron/yields.urqmd.C
+++ b/macro/hadron/yields.urqmd.C
@@ -1,6 +1,4 @@
-/** @file yields.urqmd.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void yields_urqmd()
 {
   Float_t timeResolution = 80;
diff --git a/macro/htrack/Style.C b/macro/htrack/Style.C
index 13ba8668f3..fc0ef5d07b 100644
--- a/macro/htrack/Style.C
+++ b/macro/htrack/Style.C
@@ -1,6 +1,4 @@
-/** @file Style.C
-  * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 //////////////////////////////////////////////////////////////////////
 //
 // ROOT style macro for the TDR
diff --git a/macro/htrack/runHoughStsTrackFinder.C b/macro/htrack/runHoughStsTrackFinder.C
index 850e9f14b0..ed5a3f5237 100644
--- a/macro/htrack/runHoughStsTrackFinder.C
+++ b/macro/htrack/runHoughStsTrackFinder.C
@@ -1,6 +1,3 @@
-/** @file runHoughStsTrackFinder.C
-  * @copyright Copyright (C) 2007-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction in STS from MC data
diff --git a/macro/htrack/runProduceFile.C b/macro/htrack/runProduceFile.C
index 8dd19e1807..0a7388a13f 100644
--- a/macro/htrack/runProduceFile.C
+++ b/macro/htrack/runProduceFile.C
@@ -1,6 +1,3 @@
-/** @file runProduceFile.C
-  * @copyright Copyright (C) 2007-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/kronos/histos/CalculateEfficiency.C b/macro/kronos/histos/CalculateEfficiency.C
index 91cd787455..152f74ce20 100644
--- a/macro/kronos/histos/CalculateEfficiency.C
+++ b/macro/kronos/histos/CalculateEfficiency.C
@@ -1,8 +1,6 @@
-/** @file CalculateEfficiency.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void CalculateEfficiency(TString inputDir)
 {
+
   TStopwatch timer;
   timer.Start();
 
diff --git a/macro/kronos/macro/run_mc.C b/macro/kronos/macro/run_mc.C
index 6ba81a47d9..c88e6f6f77 100644
--- a/macro/kronos/macro/run_mc.C
+++ b/macro/kronos/macro/run_mc.C
@@ -1,6 +1,3 @@
-/** @file run_mc.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/littrack/clustering/test_much_vis.C b/macro/littrack/clustering/test_much_vis.C
index 6fa03c9124..9f728c54bd 100644
--- a/macro/littrack/clustering/test_much_vis.C
+++ b/macro/littrack/clustering/test_much_vis.C
@@ -1,6 +1,3 @@
-/** @file test_much_vis.C
-  * @copyright Copyright (C) 2012 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for visualization of MC points and reconstructed hits
diff --git a/macro/littrack/eloss_ana.C b/macro/littrack/eloss_ana.C
index ae089fd10f..a13df049b7 100644
--- a/macro/littrack/eloss_ana.C
+++ b/macro/littrack/eloss_ana.C
@@ -1,6 +1,3 @@
-/** @file eloss_ana.C
-  * @copyright Copyright (C) 2008-2009 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eloss_ana(Int_t nEvents = 20000)
 {
   TString dir     = "/home/d/andrey/eloss/";
diff --git a/macro/littrack/eloss_sim.C b/macro/littrack/eloss_sim.C
index 8d5e51748a..1048fbf629 100644
--- a/macro/littrack/eloss_sim.C
+++ b/macro/littrack/eloss_sim.C
@@ -1,6 +1,3 @@
-/** @file eloss_sim.C
-  * @copyright Copyright (C) 2008-2010 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eloss_sim(Int_t nEvents = 20000)
 {
   TString dir     = "/home/d/andrey/eloss/";
diff --git a/macro/littrack/fit_speed.C b/macro/littrack/fit_speed.C
index d7f102bd94..216c3cad7b 100644
--- a/macro/littrack/fit_speed.C
+++ b/macro/littrack/fit_speed.C
@@ -1,6 +1,3 @@
-/** @file fit_speed.C
-  * @copyright Copyright (C) 2009-2010 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void fit_speed(Int_t nEvents = 10000)
 {
   TString dir              = "/d/cbm02/andrey/std13_10mu/";
diff --git a/macro/littrack/phys.C b/macro/littrack/phys.C
index 70e52a5437..9a74619dc3 100644
--- a/macro/littrack/phys.C
+++ b/macro/littrack/phys.C
@@ -1,6 +1,4 @@
-/** @file phys.C
-  * @copyright Copyright (C) 2012 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void phys(Int_t nEvents = 100)
 {
   TStopwatch timer;
diff --git a/macro/littrack/radlength_sim.C b/macro/littrack/radlength_sim.C
index 5e51fcd37b..dd33a14792 100644
--- a/macro/littrack/radlength_sim.C
+++ b/macro/littrack/radlength_sim.C
@@ -1,6 +1,3 @@
-/** @file radlength_sim.C
-  * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <algorithm>
 #include <iostream>
 using std::cout;
diff --git a/macro/littrack/scripts/much/check_files.C b/macro/littrack/scripts/much/check_files.C
index 5594b17a01..8fdc33927a 100644
--- a/macro/littrack/scripts/much/check_files.C
+++ b/macro/littrack/scripts/much/check_files.C
@@ -1,6 +1,3 @@
-/** @file check_files.C
-  * @copyright Copyright (C) 2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TFile.h"
 #include "TH1.h"
 #include "TTree.h"
diff --git a/macro/littrack/scripts/much/much_ana.C b/macro/littrack/scripts/much/much_ana.C
index c2ffbfd6c8..ebfffa0597 100644
--- a/macro/littrack/scripts/much/much_ana.C
+++ b/macro/littrack/scripts/much/much_ana.C
@@ -1,6 +1,4 @@
-/** @file much_ana.C
-  * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void much_ana(Int_t nEvents = 1000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/littrack/test_matrix_math.C b/macro/littrack/test_matrix_math.C
index 18a4265b34..1d7b5ba975 100644
--- a/macro/littrack/test_matrix_math.C
+++ b/macro/littrack/test_matrix_math.C
@@ -1,6 +1,3 @@
-/** @file test_matrix_math.C
-  * @copyright Copyright (C) 2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void test_matrix_math()
 {
   gROOT->LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C");
diff --git a/macro/mcbm/eventDisplay.C b/macro/mcbm/eventDisplay.C
index d70e8790d3..2808729af0 100644
--- a/macro/mcbm/eventDisplay.C
+++ b/macro/mcbm/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 bfe6ed0adb..29665ef802 100644
--- a/macro/mcbm/eventDisplay_reco.C
+++ b/macro/mcbm/eventDisplay_reco.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay_reco.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C b/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C
index c1b2828d2d..daec7fbce7 100644
--- a/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C
+++ b/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18m_mCbm.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18k_mCbm.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/mcbm/geometry/hodo/test_hodogeo_reco.C b/macro/mcbm/geometry/hodo/test_hodogeo_reco.C
index 85e6c0b97a..0c628f48c7 100644
--- a/macro/mcbm/geometry/hodo/test_hodogeo_reco.C
+++ b/macro/mcbm/geometry/hodo/test_hodogeo_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of mcbm data (2019)
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C
index 35e274ba23..0fa332b85b 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18b.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18b.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C
index 20ac3eacc1..657492c219 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18c.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18c.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C
index f08bd9d1dc..e51482b691 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18d.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18d.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C
index ed5f78adc6..409aaaaf2c 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18e.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18e.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C
index 0c14eb8b95..98763412bb 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18e1.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18e.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C
index 5910e5564e..98ffc522f2 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18f.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18f.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C
index fedde46ff5..52d35342e2 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18g.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18g.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C
index 3e4ddacaa9..d57cc20384 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //
 /// \file create_MUCH_geometry_v18h.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C
index ddbaae3b21..e72ce6ee3a 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18i.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18i.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C
index dfdf698d6c..92371dc993 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18j.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18j.C
 /// \brief Generates MUCH geometry in Root format.
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 bbe8fbcb85..fd292e26a8 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v19a_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v19a.C
 /// \brief Generates MUCH geometry in Root format.
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 73df1837be..35c5e54eae 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v19b_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v19b.C
 /// \brief Generates MUCH geometry in Root format.
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 e211a47460..9ba4e6dd79 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //
 /// \file create_MUCH_geometry_v19b.C
 /// \brief Generates MUCH geometry in Root format.
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 030e5797b4..48ab6d60d7 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //
 /// \file create_MUCH_geometry_v19d.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C
index bca3207864..57846ff783 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C
@@ -1,9 +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 **/
 #include <iostream>
 using namespace std;
 
+
 enum RichGeomType
 {
   kGlassLense,
diff --git a/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C
index 95ac1cf298..dbd293b308 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C
@@ -1,8 +1,6 @@
-/** @file create_rich_v18b_mcbm.C
-  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 using namespace std;
+
 // Changelog
 //
 // 2017-07-19 - v18b - DE - add one level to the geometry hierarchy
diff --git a/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C
index b6ef810092..e0033aca4f 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C
@@ -1,8 +1,6 @@
-/** @file create_rich_v18c_mcbm.C
-  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 using namespace std;
+
 // Changelog
 //
 // 2017-11-12 - v18c - DE - push mRICH downstream to z=355 cm for long setup
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 d6d4210924..41280d3de0 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C
@@ -1,8 +1,6 @@
-/** @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 **/
 #include <iostream>
 using namespace std;
+
 // Changelog
 //
 // 2017-11-17 - v18d - DE - add aerogel as radiator to the mRICH module
diff --git a/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C
index 9d93882b9b..4bf0f2e5bb 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v18d_mcbm.C
-  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TDatime.h"
 #include "TFile.h"
 #include "TGeoArb8.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C
index e070a234d1..1e3a520203 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v18e_mcbm.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TDatime.h"
 #include "TFile.h"
 #include "TGeoArb8.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C
index b2cbed63c5..32283dc9f0 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v18f_mcbm.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TDatime.h"
 #include "TFile.h"
 #include "TGeoArb8.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C
index d5b5960bd8..0bda76d19b 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v18g_mcbm.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TDatime.h"
 #include "TFile.h"
 #include "TGeoArb8.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C
index f79fb88932..e3b3f69f18 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v18h_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TDatime.h"
 #include "TFile.h"
 #include "TGeoArb8.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C
index dc5708c8c6..6421dfb4ba 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v19a_mcbm.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C
index 1b593ba4d0..adbbcedca0 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v19b_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C
index 8bca349e73..bae4ffe0a7 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v19c_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C
index c4fabcb6b3..e9a4e8f90f 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v19d_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C
index 38d4a28cd1..5fced8e956 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v19e_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C
index 7f1dce07d0..171fd3c67c 100644
--- a/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v20b_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C
index 9ce9585d87..c14728db52 100644
--- a/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v20c_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C
index 02efca30de..b098b7bc6c 100644
--- a/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C
@@ -1,6 +1,3 @@
-/** @file create_rich_v20d_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 //#include "FairGeoMedium.h"
 //#include "FairGeoBuilder.h"
diff --git a/macro/mcbm/geometry/targetbox/ctub_orig.C b/macro/mcbm/geometry/targetbox/ctub_orig.C
index 429078c08b..989e86a1bb 100644
--- a/macro/mcbm/geometry/targetbox/ctub_orig.C
+++ b/macro/mcbm/geometry/targetbox/ctub_orig.C
@@ -1,8 +1,6 @@
-/** @file ctub_orig.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
+
 void ctub_orig()
 {
   TCanvas* c = new TCanvas("c", "c", 0, 0, 600, 600);
diff --git a/macro/mcbm/geometry/targetbox/cutout1.C b/macro/mcbm/geometry/targetbox/cutout1.C
index 243c8ff596..e2da01de45 100644
--- a/macro/mcbm/geometry/targetbox/cutout1.C
+++ b/macro/mcbm/geometry/targetbox/cutout1.C
@@ -1,8 +1,6 @@
-/** @file cutout1.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
+
 void cutout1()
 {
   TCanvas* c = new TCanvas("c", "c", 0, 0, 600, 600);
diff --git a/macro/mcbm/geometry/targetbox/cutout2.C b/macro/mcbm/geometry/targetbox/cutout2.C
index ad9ba9fcb2..8ca6805fb1 100644
--- a/macro/mcbm/geometry/targetbox/cutout2.C
+++ b/macro/mcbm/geometry/targetbox/cutout2.C
@@ -1,8 +1,6 @@
-/** @file cutout2.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
+
 void cutout2()
 {
   TCanvas* c = new TCanvas("c", "c", 0, 0, 600, 600);
diff --git a/macro/mcbm/geometry/targetbox/targetbox1.C b/macro/mcbm/geometry/targetbox/targetbox1.C
index 58b1043db7..4e5b1968dd 100644
--- a/macro/mcbm/geometry/targetbox/targetbox1.C
+++ b/macro/mcbm/geometry/targetbox/targetbox1.C
@@ -1,8 +1,6 @@
-/** @file targetbox1.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
+
 void targetbox1()
 {
   TCanvas* c = new TCanvas("c", "c", 0, 0, 600, 600);
diff --git a/macro/mcbm/geometry/targetbox/targetbox2.C b/macro/mcbm/geometry/targetbox/targetbox2.C
index ff5d6f6f9a..b80a31c4c4 100644
--- a/macro/mcbm/geometry/targetbox/targetbox2.C
+++ b/macro/mcbm/geometry/targetbox/targetbox2.C
@@ -1,8 +1,6 @@
-/** @file targetbox2.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
+
 // dimensions from z = -38.0 cm to z = +59.8 cm
 // dimensions of core [-29.9 cm .. +15.2 cm]
 // dimensions of sections -38.0 cm | + 7.7 + 0.4 + 45.1 + 0.6 + 44.0 | +59.8 cm
diff --git a/macro/mcbm/geometry/targetbox/targetbox3.C b/macro/mcbm/geometry/targetbox/targetbox3.C
index 96f7d41654..739f2c39f2 100644
--- a/macro/mcbm/geometry/targetbox/targetbox3.C
+++ b/macro/mcbm/geometry/targetbox/targetbox3.C
@@ -1,8 +1,6 @@
-/** @file targetbox3.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
+
 // dimensions from z = -38.0 cm to z = +59.8 cm
 // dimensions of core [-29.9 cm .. +15.2 cm]
 // dimensions of sections -38.0 cm | + 7.7 + 0.4 + 45.1 + 0.6 + 44.0 | +59.8 cm
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 12677d018d..eb58f2f2cb 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_mCBM_1.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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 83f1ba082a..5f263fc31a 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
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 88d9e86fad..3fc786bd3b 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
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 f4ac590e3b..35d6827401 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18_3x.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
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 4e5bef5ad5..a6d52e19f1 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18d_mcbm.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18d_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 264b36143b..93d77e3e35 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18e_mcbm.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18e_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 4d45250c57..86d747ae71 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18f_mcbm.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18f_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 630187598f..81bf70ac27 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18g_mcbm.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18g_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 848c200d52..f61916ab99 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18h_mcbm.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18h_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 342e32b065..5ef7093145 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18i_mcbm.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18h_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 b3334f31a8..57268e9be7 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18j_mcbm.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18j_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 2cea4d67bd..2ffa5e8e3c 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18k_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18k_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 25d28a3a08..64f53d3b2a 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18l_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18l_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 a5fac967f1..5ea22dfddb 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v19a_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v19a_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 3138db93e5..7b7938dd46 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v19b_mcbm.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v19a_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 2f835ea237..1a1903d68a 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v19c_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v19a_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 3501af1306..7dcd5bc539 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v19d_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v19d_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 5125ba37fd..ad9c353098 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v19e_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v19e_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 d713ae0809..19b9a80d67 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20a_cosmicHD.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file derived from Create_TOF_Geometry_v18m_mCbm.C
 /// \brief Generates TOF geometry in Root format.
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 41d5933526..1bbe1ca9f6 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20a_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v20a_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 7857eb701e..7266516558 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20b_cosmicHD.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file derived from Create_TOF_Geometry_v18m_mCbm.C
 /// \brief Generates TOF geometry in Root format.
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 288cbed40a..4e13abbdf2 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20b_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v20b_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 681fd6d33b..f5fae88852 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20c_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v20b_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 ffeee0db05..7d82be8d54 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20d_cosmicHD.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file derived from Create_TOF_Geometry_v18m_mCbm.C
 /// \brief Generates TOF geometry in Root format.
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 29b34bf6bd..50a6fab261 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20d_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v20b_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 2c6d82eefa..290511a1b6 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20e_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v20e_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 e766e7d890..582af10ecf 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v20f_mcbm.C
-  * @copyright Copyright (C) 2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v20f_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 bf3a079fde..9979f00e7b 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v21a_mcbm.C
 /// \brief Generates TOF geometry in Root format.
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 32b00e0e21..0d7ee45b38 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v21b_mcbm.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v21b_mcbm.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C
index 471354df3e..1380ede475 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17s.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17s.C
 /// \brief Generates TRD geometry in Root format.
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 20dd82e0b1..dee5bbf79e 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v18a.C
 /// \brief Generates TRD geometry in Root format.
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 0e3ccbce07..6a677d5889 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v18a.C
 /// \brief Generates TRD geometry in Root format.
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 b098898108..9d6b4f4f93 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v18a.C
 /// \brief Generates TRD geometry in Root format.
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 8e5e6cc642..f0efec6f30 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C
@@ -1,6 +1,4 @@
-/** @file Create_TRD_Geometry_v18d_1e.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 ///
 /// \file Create_TRD_Geometry_v18a.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C
index 52e99d9353..b87cd51348 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18e.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18e.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C
index 0f8d5d6345..1914e5aa87 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18f.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18f.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C
index ea7dcf2241..46e36b71cc 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18g.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18g.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C
index db504695c3..2f11513f19 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18h.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18h.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C
index 7a7a3513b6..c98c279df0 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18i.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18i.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C
index 8d4f5015be..9386710d6f 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18j.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18j.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C
index 346fcc1de4..a948a4d878 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18k.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18k.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C
index e2d754fb28..21072a24c8 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18l.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18l.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C
index 53b8fa6491..469e2e2376 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18m.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18m.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C
index d680f147ad..028888cd5a 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18n.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18n.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C
index 154b1bd900..e014cd0443 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18o.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18o.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C
index 3b57ee2580..9ff3574450 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18p.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18p.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C
index f3bcf34a46..fd14a39fb3 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18q.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18q.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C
index a47954d92e..c0a25b4595 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v18r.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v18r.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C
index 3ae0994b05..658f77cfb7 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v20a.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v20a.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C
index 9c72403fed..a40fd951eb 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v20b.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v20b.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/mcbm/legacy/eventDisplay.C b/macro/mcbm/legacy/eventDisplay.C
index afd4494450..d6169d6ab0 100644
--- a/macro/mcbm/legacy/eventDisplay.C
+++ b/macro/mcbm/legacy/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2015-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //void eventDisplay(const char* setup = "sis18_mcbm_25deg_long")
 void eventDisplay(const char* setup = "mcbm_beam_2019_03")
 // void eventDisplay(const char* setup = "mcbm_beam_2018_11")
diff --git a/macro/mcbm/legacy/mcbm_mc.C b/macro/mcbm/legacy/mcbm_mc.C
index 450b499222..f33ea18484 100644
--- a/macro/mcbm/legacy/mcbm_mc.C
+++ b/macro/mcbm/legacy/mcbm_mc.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc.C
-  * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/legacy/mcbm_mc_dev.C b/macro/mcbm/legacy/mcbm_mc_dev.C
index 8906b5cb2a..fd64d085c4 100644
--- a/macro/mcbm/legacy/mcbm_mc_dev.C
+++ b/macro/mcbm/legacy/mcbm_mc_dev.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc_dev.C
-  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/legacy/mcbm_mc_gp.C b/macro/mcbm/legacy/mcbm_mc_gp.C
index 17f77434e6..3e0dafe316 100644
--- a/macro/mcbm/legacy/mcbm_mc_gp.C
+++ b/macro/mcbm/legacy/mcbm_mc_gp.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc_gp.C
-  * @copyright Copyright (C) 2017 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/legacy/mcbm_mc_nh.C b/macro/mcbm/legacy/mcbm_mc_nh.C
index e751feb9bd..3800089269 100644
--- a/macro/mcbm/legacy/mcbm_mc_nh.C
+++ b/macro/mcbm/legacy/mcbm_mc_nh.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc_nh.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/legacy/mcbm_sim.C b/macro/mcbm/legacy/mcbm_sim.C
index 53c31af282..f3e6170e25 100644
--- a/macro/mcbm/legacy/mcbm_sim.C
+++ b/macro/mcbm/legacy/mcbm_sim.C
@@ -1,6 +1,3 @@
-/** @file mcbm_sim.C
-  * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/matbudget_ana_mcbm_mvd.C b/macro/mcbm/matbudget_ana_mcbm_mvd.C
index e043af59af..c35bf0f09b 100644
--- a/macro/mcbm/matbudget_ana_mcbm_mvd.C
+++ b/macro/mcbm/matbudget_ana_mcbm_mvd.C
@@ -1,8 +1,6 @@
-/** @file matbudget_ana_mcbm_mvd.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
+
 #include "TCanvas.h"
 #include "TClonesArray.h"
 #include "TFile.h"
diff --git a/macro/mcbm/matbudget_ana_mcbm_sts.C b/macro/mcbm/matbudget_ana_mcbm_sts.C
index 9730fa7908..6f08dc80cc 100644
--- a/macro/mcbm/matbudget_ana_mcbm_sts.C
+++ b/macro/mcbm/matbudget_ana_mcbm_sts.C
@@ -1,8 +1,6 @@
-/** @file matbudget_ana_mcbm_sts.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
+
 #include "TCanvas.h"
 #include "TClonesArray.h"
 #include "TFile.h"
diff --git a/macro/mcbm/matbudget_mc_mcbm_mvd.C b/macro/mcbm/matbudget_mc_mcbm_mvd.C
index 16cb9bbae2..f1ace52ce8 100644
--- a/macro/mcbm/matbudget_mc_mcbm_mvd.C
+++ b/macro/mcbm/matbudget_mc_mcbm_mvd.C
@@ -1,6 +1,3 @@
-/** @file matbudget_mc_mcbm_mvd.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation with the STS
diff --git a/macro/mcbm/matbudget_mc_mcbm_sts.C b/macro/mcbm/matbudget_mc_mcbm_sts.C
index fca6748d81..0171189e2f 100644
--- a/macro/mcbm/matbudget_mc_mcbm_sts.C
+++ b/macro/mcbm/matbudget_mc_mcbm_sts.C
@@ -1,6 +1,3 @@
-/** @file matbudget_mc_mcbm_sts.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation with the STS
diff --git a/macro/mcbm/mcbm_Ana.C b/macro/mcbm/mcbm_Ana.C
index 5d3bdcf146..192f1c2283 100644
--- a/macro/mcbm/mcbm_Ana.C
+++ b/macro/mcbm/mcbm_Ana.C
@@ -1,6 +1,3 @@
-/** @file mcbm_Ana.C
-  * @copyright Copyright (C) 2017-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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_check_materials.C b/macro/mcbm/mcbm_check_materials.C
index a0beecb48b..1ee926acd4 100644
--- a/macro/mcbm/mcbm_check_materials.C
+++ b/macro/mcbm/mcbm_check_materials.C
@@ -1,6 +1,3 @@
-/** @file mcbm_check_materials.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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
 // different detector systems.
diff --git a/macro/mcbm/mcbm_check_overlaps.C b/macro/mcbm/mcbm_check_overlaps.C
index 20715d0486..93849f99bd 100644
--- a/macro/mcbm/mcbm_check_overlaps.C
+++ b/macro/mcbm/mcbm_check_overlaps.C
@@ -1,6 +1,3 @@
-/** @file mcbm_check_overlaps.C
-  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void mcbm_check_overlaps(const char* dataset = "test")
 {
   // 2020-07-10 - DE - simplify overlap name checking
diff --git a/macro/mcbm/mcbm_display_event.C b/macro/mcbm/mcbm_display_event.C
index bd93cc1399..a5c22d7326 100644
--- a/macro/mcbm/mcbm_display_event.C
+++ b/macro/mcbm/mcbm_display_event.C
@@ -1,6 +1,3 @@
-/** @file mcbm_display_event.C
-  * @copyright Copyright (C) 2019-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated mCBM events with standard settings
diff --git a/macro/mcbm/mcbm_hadron_analysis.C b/macro/mcbm/mcbm_hadron_analysis.C
index 69d773bcb2..065885bdcf 100644
--- a/macro/mcbm/mcbm_hadron_analysis.C
+++ b/macro/mcbm/mcbm_hadron_analysis.C
@@ -1,6 +1,3 @@
-/** @file mcbm_hadron_analysis.C
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void mcbm_hadron_analysis(Int_t nEvents = 10, TString setup = "mcbm_beam_2020_03", const char* output = "data/test")
 {
   TString dataset(output);
diff --git a/macro/mcbm/mcbm_hadron_analysis_nh.C b/macro/mcbm/mcbm_hadron_analysis_nh.C
index 8653e5a251..34975d1a4c 100644
--- a/macro/mcbm/mcbm_hadron_analysis_nh.C
+++ b/macro/mcbm/mcbm_hadron_analysis_nh.C
@@ -1,6 +1,3 @@
-/** @file mcbm_hadron_analysis_nh.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
                              Double_t eventRate       = 1.E7,
diff --git a/macro/mcbm/mcbm_match_check.C b/macro/mcbm/mcbm_match_check.C
index 290a935301..c875080f39 100644
--- a/macro/mcbm/mcbm_match_check.C
+++ b/macro/mcbm/mcbm_match_check.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void mcbm_match_check(Int_t nEvents = 10, TString setup = "mcbm_beam_2020_03", const char* output = "data/test")
 {
   TString dataset(output);
diff --git a/macro/mcbm/mcbm_mc_nh.C b/macro/mcbm/mcbm_mc_nh.C
index 5087372d54..c8f67d55a0 100644
--- a/macro/mcbm/mcbm_mc_nh.C
+++ b/macro/mcbm/mcbm_mc_nh.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc_nh.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/mcbm_pribeam.C b/macro/mcbm/mcbm_pribeam.C
index 07a48fcbf9..97ffc98be9 100644
--- a/macro/mcbm/mcbm_pribeam.C
+++ b/macro/mcbm/mcbm_pribeam.C
@@ -1,6 +1,3 @@
-/** @file mcbm_pribeam.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C
index c2d1e99e14..13135a387c 100644
--- a/macro/mcbm/mcbm_qa.C
+++ b/macro/mcbm/mcbm_qa.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for simulation & reconstruction QA
diff --git a/macro/mcbm/mcbm_qa_nh.C b/macro/mcbm/mcbm_qa_nh.C
index 110c6143cd..4c5ed4b776 100644
--- a/macro/mcbm/mcbm_qa_nh.C
+++ b/macro/mcbm/mcbm_qa_nh.C
@@ -1,6 +1,3 @@
-/** @file mcbm_qa_nh.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/mcbm/mcbm_reco.C b/macro/mcbm/mcbm_reco.C
index 406d5bdc16..cffe75bcf1 100644
--- a/macro/mcbm/mcbm_reco.C
+++ b/macro/mcbm/mcbm_reco.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco.C
-  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/mcbm/mcbm_reco_dev.C b/macro/mcbm/mcbm_reco_dev.C
index 5c27e81593..f4f5bc7c75 100644
--- a/macro/mcbm/mcbm_reco_dev.C
+++ b/macro/mcbm/mcbm_reco_dev.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco_dev.C
-  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 192efa0c4e..f3ab80e137 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco_event.C
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated mCBM events with standard settings
diff --git a/macro/mcbm/mcbm_reco_event_tb.C b/macro/mcbm/mcbm_reco_event_tb.C
index 46f81afd2e..53744586b0 100644
--- a/macro/mcbm/mcbm_reco_event_tb.C
+++ b/macro/mcbm/mcbm_reco_event_tb.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco_event_tb.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated/experimental mCBM events with standard settings
diff --git a/macro/mcbm/mcbm_reco_event_tb_nh.C b/macro/mcbm/mcbm_reco_event_tb_nh.C
index 76c9a3e515..089d42dfd2 100644
--- a/macro/mcbm/mcbm_reco_event_tb_nh.C
+++ b/macro/mcbm/mcbm_reco_event_tb_nh.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated mCBM events with standard settings
diff --git a/macro/mcbm/mcbm_reco_gp.C b/macro/mcbm/mcbm_reco_gp.C
index 1ef13d2d6e..81b7739762 100644
--- a/macro/mcbm/mcbm_reco_gp.C
+++ b/macro/mcbm/mcbm_reco_gp.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco_gp.C
-  * @copyright Copyright (C) 2017 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/mcbm/mcbm_reco_nh.C b/macro/mcbm/mcbm_reco_nh.C
index 2c81d54df4..ee39d955aa 100644
--- a/macro/mcbm/mcbm_reco_nh.C
+++ b/macro/mcbm/mcbm_reco_nh.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco_nh.C
-  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/mcbm/pl_lambda.C b/macro/mcbm/pl_lambda.C
index d92eb94ac0..d06f44ea00 100644
--- a/macro/mcbm/pl_lambda.C
+++ b/macro/mcbm/pl_lambda.C
@@ -1,6 +1,3 @@
-/** @file pl_lambda.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_lambda(Double_t sf = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/mcbm/save_hst.C b/macro/mcbm/save_hst.C
index c661b69122..e3e1953c4d 100644
--- a/macro/mcbm/save_hst.C
+++ b/macro/mcbm/save_hst.C
@@ -1,8 +1,6 @@
-/** @file save_hst.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_hst(TString cstr = "status.hst.root")
 {
+
   gROOT->cd();
 
   cout << "Save all histos from directory " << gDirectory->GetName() << " to file " << cstr.Data() << endl;
diff --git a/macro/mcbm/sps17_mc.C b/macro/mcbm/sps17_mc.C
index 1652da861c..c674342622 100644
--- a/macro/mcbm/sps17_mc.C
+++ b/macro/mcbm/sps17_mc.C
@@ -1,6 +1,3 @@
-/** @file sps17_mc.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/much/add_histo.C b/macro/much/add_histo.C
index 248c114978..f4933107dc 100644
--- a/macro/much/add_histo.C
+++ b/macro/much/add_histo.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void add_histo(Int_t NofFiles = 5000, TString type = "sub_histo", TString dir = "sis100_muon_lmvm/8gev/centr_010")
 {
   TString name;
diff --git a/macro/much/draw_histo.C b/macro/much/draw_histo.C
index 0038536d2d..c75e866568 100644
--- a/macro/much/draw_histo.C
+++ b/macro/much/draw_histo.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void draw_histo(TString input = "sis100_muon_lmvm/8gev/centr_010_sup_histo.root")
 {
   gStyle->SetHistLineWidth(6);
diff --git a/macro/much/geometry/create_MUCH_geometry_v17a.C b/macro/much/geometry/create_MUCH_geometry_v17a.C
index 2b0be510f5..c1d17dcf0b 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17a.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17a.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v17a.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v17a.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_MUCH_geometry_v17b.C b/macro/much/geometry/create_MUCH_geometry_v17b.C
index 7541f95d5a..89834cc214 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17b.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17b.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v17b.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v17b.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C b/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C
index 5644fd925b..2c12e519d1 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v17b_jpsi.C
-  * @copyright Copyright (C) 2017-2018 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v17b.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C
index 4545cd60ca..98ee5d0d81 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v17b_lmvm.C
-  * @copyright Copyright (C) 2017-2018 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v17b.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C b/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C
index 6e7a2597a4..979ca0e86a 100644
--- a/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C
+++ b/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C
@@ -1,6 +1,3 @@
-/** @file create_MUCH_geometry_v18a_jpsi.C
-  * @copyright Copyright (C) 2018 Variable Energy Cyclotron Centre, Kolkata
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// \file create_MUCH_geometry_v18a.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C
index 8193e83dc5..cb3d04d3c6 100644
--- a/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //
 /// \file create_MUCH_geometry_v19a.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_Much_geo_v17b.C b/macro/much/geometry/create_Much_geo_v17b.C
index e556211f2d..e6878a43f6 100644
--- a/macro/much/geometry/create_Much_geo_v17b.C
+++ b/macro/much/geometry/create_Much_geo_v17b.C
@@ -1,6 +1,3 @@
-/** @file create_Much_geo_v17b.C
-  * @copyright Copyright (C) 2017 Variable Energy Cyclotron Centre, Kolkata
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 /// File create_MUCH_geometry_v17b.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/much_draw3D.C b/macro/much/much_draw3D.C
index 3313f47295..c644fb1991 100644
--- a/macro/much/much_draw3D.C
+++ b/macro/much/much_draw3D.C
@@ -1,9 +1,7 @@
-/** @file much_draw3D.C
-  * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void much_draw3D(TString geofile = "geofile.root")
 {
 
+
   TFile* f = new TFile(geofile);
   f->Get("FairBaseParSet");
   TGeoManager* gGeoManager = (TGeoManager*) f->Get("FAIRGeom");
diff --git a/macro/much/much_histo_style.C b/macro/much/much_histo_style.C
index a5bddf42f1..71cdd93a8c 100644
--- a/macro/much/much_histo_style.C
+++ b/macro/much/much_histo_style.C
@@ -1,7 +1,5 @@
-/** @file much_histo_style.C
-  * @copyright Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TStyle.h"
+
 void much_histo_style()
 {
   gStyle->SetCanvasColor(10);
diff --git a/macro/much/much_hitsQa.C b/macro/much/much_hitsQa.C
index 28ec631fbc..3c2da51842 100644
--- a/macro/much/much_hitsQa.C
+++ b/macro/much/much_hitsQa.C
@@ -1,6 +1,3 @@
-/** @file much_hitsQa.C
-  * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 // Macro for qualitycheck of the MUCH hit producer
 // E.Kryshen 22.11.2007
diff --git a/macro/much/much_hits_gem.C b/macro/much/much_hits_gem.C
index 1c0fee826e..49a4e7b7c3 100644
--- a/macro/much/much_hits_gem.C
+++ b/macro/much/much_hits_gem.C
@@ -1,6 +1,3 @@
-/** @file much_hits_gem.C
-  * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // flag =0 for sis100 flag =1 for mini cbm geometry
 void much_hits_gem(Int_t flag = 1)
 {
diff --git a/macro/much/run_ana.C b/macro/much/run_ana.C
index eddc5782bd..ef2e50747d 100644
--- a/macro/much/run_ana.C
+++ b/macro/much/run_ana.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //---------------------------------------------------
 //
 // Anna Senger a.senger@gsi.de
diff --git a/macro/mvd/digitise.C b/macro/mvd/digitise.C
index 17b501aee0..522ec581ce 100644
--- a/macro/mvd/digitise.C
+++ b/macro/mvd/digitise.C
@@ -1,6 +1,3 @@
-/** @file digitise.C
-  * @copyright Copyright (C) 2008-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/mvd/digitise_and_HitReco.C b/macro/mvd/digitise_and_HitReco.C
index 0cb3a2d11a..542f4422bc 100644
--- a/macro/mvd/digitise_and_HitReco.C
+++ b/macro/mvd/digitise_and_HitReco.C
@@ -1,6 +1,3 @@
-/** @file digitise_and_HitReco.C
-  * @copyright Copyright (C) 2008-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/mvd/geometry/Create_Simple_MVD_Geometry.C b/macro/mvd/geometry/Create_Simple_MVD_Geometry.C
index fb0e467bdd..cb4030d4be 100644
--- a/macro/mvd/geometry/Create_Simple_MVD_Geometry.C
+++ b/macro/mvd/geometry/Create_Simple_MVD_Geometry.C
@@ -1,6 +1,3 @@
-/** @file Create_Simple_MVD_Geometry.C
-  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_Simple_MVD_Geometry
 /// \brief Generates simple MVD geometry in Root format.
diff --git a/macro/mvd/mvd_CbmUniGen_reco_cluster.C b/macro/mvd/mvd_CbmUniGen_reco_cluster.C
index ec341da799..9627414c8e 100644
--- a/macro/mvd/mvd_CbmUniGen_reco_cluster.C
+++ b/macro/mvd/mvd_CbmUniGen_reco_cluster.C
@@ -1,6 +1,3 @@
-/** @file mvd_CbmUniGen_reco_cluster.C
-  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/mvd/mvd_CbmUniGen_sim_cluster.C b/macro/mvd/mvd_CbmUniGen_sim_cluster.C
index 36f998b869..d5069179b4 100644
--- a/macro/mvd/mvd_CbmUniGen_sim_cluster.C
+++ b/macro/mvd/mvd_CbmUniGen_sim_cluster.C
@@ -1,6 +1,3 @@
-/** @file mvd_CbmUniGen_sim_cluster.C
-  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input with CbmUniGen
diff --git a/macro/mvd/mvd_analyse.C b/macro/mvd/mvd_analyse.C
index 2410d18ccb..76d2a7b8e1 100644
--- a/macro/mvd/mvd_analyse.C
+++ b/macro/mvd/mvd_analyse.C
@@ -1,6 +1,5 @@
-/** @file mvd_analyse.C
-  * @copyright Copyright (C) 2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void mvd_analyse(TString input = "auau.25gev", TString system = "centr", Int_t nEvents = 100, Int_t iVerbose = 0,
                  const char* setup = "sis300_electron", bool PileUp = true, bool littrack = false)
 {
diff --git a/macro/mvd/mvd_reco.C b/macro/mvd/mvd_reco.C
index 3f939d683d..765aca33f0 100644
--- a/macro/mvd/mvd_reco.C
+++ b/macro/mvd/mvd_reco.C
@@ -1,6 +1,3 @@
-/** @file mvd_reco.C
-  * @copyright Copyright (C) 2007-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/mvd/mvd_sim.C b/macro/mvd/mvd_sim.C
index 4a92f41141..202f217106 100644
--- a/macro/mvd/mvd_sim.C
+++ b/macro/mvd/mvd_sim.C
@@ -1,6 +1,3 @@
-/** @file mvd_sim.C
-  * @copyright Copyright (C) 2007-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mvd/mvd_transDelta.C b/macro/mvd/mvd_transDelta.C
index 7845e6f73e..5b8da801fc 100644
--- a/macro/mvd/mvd_transDelta.C
+++ b/macro/mvd/mvd_transDelta.C
@@ -1,6 +1,3 @@
-/** @file mvd_transDelta.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------
 //
 // Macro for standard transport delta simulation using GEANT3
diff --git a/macro/mvd/qa/mvd_digitize_for_debugging.C b/macro/mvd/qa/mvd_digitize_for_debugging.C
index 78e8657160..939d1f2a49 100644
--- a/macro/mvd/qa/mvd_digitize_for_debugging.C
+++ b/macro/mvd/qa/mvd_digitize_for_debugging.C
@@ -1,6 +1,3 @@
-/** @file mvd_digitize_for_debugging.C
-  * @copyright Copyright (C) 2011 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/mvd/qa/mvd_qa1_transUrqmd.C b/macro/mvd/qa/mvd_qa1_transUrqmd.C
index 129b3be43a..7922cf645b 100644
--- a/macro/mvd/qa/mvd_qa1_transUrqmd.C
+++ b/macro/mvd/qa/mvd_qa1_transUrqmd.C
@@ -1,6 +1,3 @@
-/** @file mvd_qa1_transUrqmd.C
-  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mvd/qa/mvd_qa2_transDelta.C b/macro/mvd/qa/mvd_qa2_transDelta.C
index bfa6e30ac7..1e9acaca26 100644
--- a/macro/mvd/qa/mvd_qa2_transDelta.C
+++ b/macro/mvd/qa/mvd_qa2_transDelta.C
@@ -1,6 +1,3 @@
-/** @file mvd_qa2_transDelta.C
-  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mvd/qa/mvd_qa3_digitize.C b/macro/mvd/qa/mvd_qa3_digitize.C
index 4e0ef3a9be..f4437027c2 100644
--- a/macro/mvd/qa/mvd_qa3_digitize.C
+++ b/macro/mvd/qa/mvd_qa3_digitize.C
@@ -1,6 +1,3 @@
-/** @file mvd_qa3_digitize.C
-  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/mvd/qa/mvd_qa4_reco.C b/macro/mvd/qa/mvd_qa4_reco.C
index 7b9c04bb11..1f5e423215 100644
--- a/macro/mvd/qa/mvd_qa4_reco.C
+++ b/macro/mvd/qa/mvd_qa4_reco.C
@@ -1,6 +1,3 @@
-/** @file mvd_qa4_reco.C
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local MVD reconstruction from MC data
diff --git a/macro/obsolete/drawGLTracks.C b/macro/obsolete/drawGLTracks.C
index f77e641877..2fa0640507 100644
--- a/macro/obsolete/drawGLTracks.C
+++ b/macro/obsolete/drawGLTracks.C
@@ -1,7 +1,5 @@
-/** @file drawGLTracks.C
-  * @copyright Copyright (C) 2007-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
+
   TFile* f         = new TFile("data/test.mc.root");
   TTree* t         = f->Get("cbmsim");
   TClonesArray* fT = new TClonesArray("TGeoTrack");
diff --git a/macro/obsolete/lhetrack.C b/macro/obsolete/lhetrack.C
index d6b19f8195..a158b39b25 100644
--- a/macro/obsolete/lhetrack.C
+++ b/macro/obsolete/lhetrack.C
@@ -1,6 +1,3 @@
-/** @file lhetrack.C
-  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 //  script to run tracking routine with LHEtrack's classes
 //  Modified 21/06/2005
diff --git a/macro/obsolete/run_reco_flow.C b/macro/obsolete/run_reco_flow.C
index 10b8fd05f3..67cdf556fb 100644
--- a/macro/obsolete/run_reco_flow.C
+++ b/macro/obsolete/run_reco_flow.C
@@ -1,6 +1,3 @@
-/** @file run_reco_flow.C
-  * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/obsolete/run_sim_flow.C b/macro/obsolete/run_sim_flow.C
index 9fdd79fc4e..ce6c967621 100644
--- a/macro/obsolete/run_sim_flow.C
+++ b/macro/obsolete/run_sim_flow.C
@@ -1,6 +1,3 @@
-/** @file run_sim_flow.C
-  * @copyright Copyright (C) 2015-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation for the sake of collective flow studies, using UrQMD or SHIELD input and GEANT4
diff --git a/macro/passive/pipe_v16a_mvdsts100.h b/macro/passive/pipe_v16a_mvdsts100.h
index ba8aa7d358..4f72a7fee1 100644
--- a/macro/passive/pipe_v16a_mvdsts100.h
+++ b/macro/passive/pipe_v16a_mvdsts100.h
@@ -1,6 +1,5 @@
-/** @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 **/
+
+
 // -----   Define beam pipe sections   --------------------------------------
 TString pipe1name         = "pipe1 - vacuum chamber";
 const Int_t nSects1       = 6;
diff --git a/macro/psd/build_correlations_tof.C b/macro/psd/build_correlations_tof.C
index ad6358311b..9865a75abb 100644
--- a/macro/psd/build_correlations_tof.C
+++ b/macro/psd/build_correlations_tof.C
@@ -1,8 +1,6 @@
-/** @file build_correlations_tof.C
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //#include <FairParIo.h>
 #include <FairRuntimeDb.h>
+
 void build_correlations_tof(const string& digiFile = "/home/nikolay/FairRoot/cbmroot_trunk/macro/"
                                                      "beamtime/mcbm2020/data/unp_mcbm_582.root",
                             const string& parFile = "/home/nikolay/FairRoot/cbmroot_trunk/macro/beamtime/"
diff --git a/macro/rich/CbmRichHitsProd.C b/macro/rich/CbmRichHitsProd.C
index f023cfbc67..d662fd3f7d 100644
--- a/macro/rich/CbmRichHitsProd.C
+++ b/macro/rich/CbmRichHitsProd.C
@@ -1,7 +1,6 @@
-/** @file CbmRichHitsProd.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /* $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 959585cae0..6c34f280bd 100644
--- a/macro/rich/CbmRichTestHits.C
+++ b/macro/rich/CbmRichTestHits.C
@@ -1,6 +1,3 @@
-/** @file CbmRichTestHits.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /***************************************************************
 * $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 d5a0f68e80..3912190c17 100644
--- a/macro/rich/CbmRichTestSim.C
+++ b/macro/rich/CbmRichTestSim.C
@@ -1,6 +1,3 @@
-/** @file CbmRichTestSim.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /***************************************************************
 * $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 887edb7bbf..1899f7b378 100644
--- a/macro/rich/alignment/Draw/Comp_Hist.C
+++ b/macro/rich/alignment/Draw/Comp_Hist.C
@@ -1,8 +1,6 @@
-/** @file Comp_Hist.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TH1.h"
 #include "TH2D.h"
+
 #include <iomanip>
 #include <vector>
 
diff --git a/macro/rich/alignment/Draw/Draw_Proj.C b/macro/rich/alignment/Draw/Draw_Proj.C
index 5cdd3bf83e..d56ca629a9 100644
--- a/macro/rich/alignment/Draw/Draw_Proj.C
+++ b/macro/rich/alignment/Draw/Draw_Proj.C
@@ -1,7 +1,5 @@
-/** @file Draw_Proj.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "/u/jbendar/cbmroot5/CBMSRC/base/draw/CbmDrawHist.h"
+
 #include <iomanip>
 #include <vector>
 
diff --git a/macro/rich/alignment/Draw/Draw_lit_reco_qa.C b/macro/rich/alignment/Draw/Draw_lit_reco_qa.C
index 1e75c47e94..6d9b11a1a6 100644
--- a/macro/rich/alignment/Draw/Draw_lit_reco_qa.C
+++ b/macro/rich/alignment/Draw/Draw_lit_reco_qa.C
@@ -1,7 +1,5 @@
-/** @file Draw_lit_reco_qa.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
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 0e2b11273c..88665a0604 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,5 @@
-/** @file draw_lit_reco_qa_matching.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa_matching(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
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 ef10277f88..3f441edf66 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,5 @@
-/** @file draw_lit_reco_qa_position.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa_position(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
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 0e2b11273c..88665a0604 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,5 @@
-/** @file draw_lit_reco_qa_matching.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa_matching(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
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 7fe934c8a6..ae6d8fc592 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,5 @@
-/** @file draw_lit_reco_qa_position.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa_position(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
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 918e8f764b..1a0540db6c 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,5 @@
-/** @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 **/
 #include <string>
+
 void draw_lit_reco_qa_position_2(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
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 5492dc7e9e..49fd1d2656 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,5 @@
-/** @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 **/
 #include <string>
+
 void draw_lit_reco_qa_position_3(bool lit, bool reco)
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
diff --git a/macro/rich/alignment/Draw/test_add.C b/macro/rich/alignment/Draw/test_add.C
index aec09b8266..33e3769f9b 100644
--- a/macro/rich/alignment/Draw/test_add.C
+++ b/macro/rich/alignment/Draw/test_add.C
@@ -1,6 +1,3 @@
-/** @file test_add.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void test_add()
 {
   TH2D* h1 = new TH2D("h1", "h1", 100, 0., 20., 100, 0., 20.);
diff --git a/macro/rich/alignment/DrawHistograms_New.C b/macro/rich/alignment/DrawHistograms_New.C
index 8b32a7eb6d..e318929e9e 100644
--- a/macro/rich/alignment/DrawHistograms_New.C
+++ b/macro/rich/alignment/DrawHistograms_New.C
@@ -1,8 +1,6 @@
-/** @file DrawHistograms_New.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iomanip>
 #include <vector>
+
 void DrawHistograms_New()
 {
   TH1F* Ref;
diff --git a/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C b/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C
index 1efe000b60..9644f352ae 100644
--- a/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C
+++ b/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C
@@ -1,7 +1,5 @@
-/** @file ReadGeoManager_New.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <unistd.h>
+
 void ReadGeoManager_New()
 {
   // ---------------------------------------------------------------------------------------------------------------------
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 f7542ad651..5d188587e6 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,6 +1,3 @@
-/** @file run_reco_align.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_align(Int_t nEvents)
 {
   TTree::SetMaxTreeSize(90000000000);
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 7de612e846..e907a2ae7e 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,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
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 418d9d246d..5fdef2c536 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,6 +1,3 @@
-/** @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 **/
 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 14fd85e085..9793ac613a 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,5 @@
-/** @file draw_lit_reco_qa.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa(bool lit, bool reco)
 {
   //	string dir = "/data/Sim_Outputs/Sim_Thesis/AuAu_10AGeV/Aligned/";
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 65c7c290f0..426d040e50 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,5 @@
-/** @file draw_lit_reco_qa_Jan2019.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 void draw_lit_reco_qa_Jan2019(bool lit, bool reco)
 {
   //	string dir = "/data/Sim_Outputs/Sim_Thesis/AuAu_10AGeV_Jan2019/Aligned/";
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 d4001d5580..9f799861b2 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,5 @@
-/** @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 **/
 #include <string>
+
 void draw_lit_reco_qa_Jan2019_8AGeV(bool lit, bool reco)
 {
   //	string dir = "/data/Sim_Outputs/Sim_Thesis/AuAu_8AGeV_Jan2019/Aligned/";
diff --git a/macro/rich/alignment/Sim_Thesis/eventDisplay.C b/macro/rich/alignment/Sim_Thesis/eventDisplay.C
index 8af80b5fd1..16d21b70c9 100644
--- a/macro/rich/alignment/Sim_Thesis/eventDisplay.C
+++ b/macro/rich/alignment/Sim_Thesis/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay()
 {
   TString dataDir   = "/home/jordan/Desktop/Thesis_Results/HERA-B_Ana/4mrad_X_2mrad_Y_5_3/New/";
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco.C b/macro/rich/alignment/Sim_Thesis/run_reco.C
index 48669c9cf5..fe2ddd91bd 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco(Int_t nEvents = 200, Int_t input = 2, Int_t geom = 0)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_2.C b/macro/rich/alignment/Sim_Thesis/run_reco_2.C
index 784ea68ed1..315244a52c 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_2.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_2.C
@@ -1,6 +1,3 @@
-/** @file run_reco_2.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_2(Int_t nEvents = 1000, Int_t input = 3, Int_t geom = 0)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_3.C b/macro/rich/alignment/Sim_Thesis/run_reco_3.C
index a88f6634f5..594b920a13 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_3.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_3.C
@@ -1,6 +1,3 @@
-/** @file run_reco_3.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_3(Int_t nEvents = 2500, Int_t geom = 3)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_4.C b/macro/rich/alignment/Sim_Thesis/run_reco_4.C
index 3d83d83221..a87bb7ce8f 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_4.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_4.C
@@ -1,6 +1,3 @@
-/** @file run_reco_4.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_4(Int_t nEvents = 10000)
 {
   TTree::SetMaxTreeSize(90000000000);
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 028d010c5f..73483ed6ec 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C
@@ -1,6 +1,3 @@
-/** @file run_reco_5_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_5_alignment(Int_t nEvents)
 {
   TTree::SetMaxTreeSize(90000000000);
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 b16a066d40..55ef2b7021 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C
@@ -1,6 +1,3 @@
-/** @file run_reco_5_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_5_correction(Int_t nEvents)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C b/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C
index 9f129ea83c..fe6bc83dce 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C
@@ -1,6 +1,3 @@
-/** @file run_reco_Jan2019.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_Jan2019(Int_t nEvents = 10000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C b/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C
index c66e8ebd66..695867ab2d 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C
@@ -1,6 +1,3 @@
-/** @file run_reco_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_backup.C b/macro/rich/alignment/Sim_Thesis/run_reco_backup.C
index 6608e41532..cf7e7dbcab 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_backup.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_backup.C
@@ -1,6 +1,3 @@
-/** @file run_reco_backup.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_correction.C b/macro/rich/alignment/Sim_Thesis/run_reco_correction.C
index 14c109d617..2c00b90027 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_correction.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_correction.C
@@ -1,6 +1,3 @@
-/** @file run_reco_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim.C b/macro/rich/alignment/Sim_Thesis/run_sim.C
index 44df7848b5..123f7d1c20 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_2.C b/macro/rich/alignment/Sim_Thesis/run_sim_2.C
index a33b546a4d..a3812dac30 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_2.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_2.C
@@ -1,6 +1,3 @@
-/** @file run_sim_2.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_3.C b/macro/rich/alignment/Sim_Thesis/run_sim_3.C
index 1f98248907..1686f0a272 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_3.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_3.C
@@ -1,6 +1,3 @@
-/** @file run_sim_3.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_4.C b/macro/rich/alignment/Sim_Thesis/run_sim_4.C
index 6751a6efca..9e75ced202 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_4.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_4.C
@@ -1,6 +1,3 @@
-/** @file run_sim_4.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_5.C b/macro/rich/alignment/Sim_Thesis/run_sim_5.C
index 5599fbe008..d8614419b8 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_5.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_5.C
@@ -1,6 +1,3 @@
-/** @file run_sim_5.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C b/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C
index f699661625..f066136d08 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C
@@ -1,6 +1,3 @@
-/** @file run_sim_Jan2019.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/Sim_Thesis/scaleHistos.C b/macro/rich/alignment/Sim_Thesis/scaleHistos.C
index e5f8b45283..c9143d13ae 100644
--- a/macro/rich/alignment/Sim_Thesis/scaleHistos.C
+++ b/macro/rich/alignment/Sim_Thesis/scaleHistos.C
@@ -1,7 +1,5 @@
-/** @file scaleHistos.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TH3D.h"
+
 #include <string>
 
 int Counter   = 0;
diff --git a/macro/rich/alignment/eventDisplay.C b/macro/rich/alignment/eventDisplay.C
index f361941f7e..74c32c6015 100644
--- a/macro/rich/alignment/eventDisplay.C
+++ b/macro/rich/alignment/eventDisplay.C
@@ -1,8 +1,6 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay(const char* setup = "sis100_electron")
 {
+
   //  TString dataDir   = "data/";
   //  TString InputFile = dataDir + setup + "_test.mc.root";
   //  TString ParFile   = dataDir + setup + "_params.root";
diff --git a/macro/rich/alignment/eventDisplay1.C b/macro/rich/alignment/eventDisplay1.C
index e3b1b2693c..e77b3dd2e5 100644
--- a/macro/rich/alignment/eventDisplay1.C
+++ b/macro/rich/alignment/eventDisplay1.C
@@ -1,8 +1,6 @@
-/** @file eventDisplay1.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay1()
 {
+
   TString dataDir   = "/data/Sim_Outputs/Event_Display/plusY/";
   TString setupName = "setup_v17a_1e_3mrad_plusY_";
   TString InputFile = dataDir + setupName + "mc.root";
diff --git a/macro/rich/alignment/gauss_distrib/eventDisplay.C b/macro/rich/alignment/gauss_distrib/eventDisplay.C
index 839fa9ac25..b47bba654e 100644
--- a/macro/rich/alignment/gauss_distrib/eventDisplay.C
+++ b/macro/rich/alignment/gauss_distrib/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay()
 {
   TString dataDir = "/data/Sim_Outputs/Event_Display/plusY/";
diff --git a/macro/rich/alignment/gauss_distrib/run_reco.C b/macro/rich/alignment/gauss_distrib/run_reco.C
index 9514ed65b7..26b4d24f69 100644
--- a/macro/rich/alignment/gauss_distrib/run_reco.C
+++ b/macro/rich/alignment/gauss_distrib/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/gauss_distrib/run_reco_alignment.C b/macro/rich/alignment/gauss_distrib/run_reco_alignment.C
index c66e8ebd66..695867ab2d 100644
--- a/macro/rich/alignment/gauss_distrib/run_reco_alignment.C
+++ b/macro/rich/alignment/gauss_distrib/run_reco_alignment.C
@@ -1,6 +1,3 @@
-/** @file run_reco_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/gauss_distrib/run_reco_correction.C b/macro/rich/alignment/gauss_distrib/run_reco_correction.C
index 14c109d617..2c00b90027 100644
--- a/macro/rich/alignment/gauss_distrib/run_reco_correction.C
+++ b/macro/rich/alignment/gauss_distrib/run_reco_correction.C
@@ -1,6 +1,3 @@
-/** @file run_reco_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/gauss_distrib/run_sim.C b/macro/rich/alignment/gauss_distrib/run_sim.C
index 8a66180604..98be692389 100644
--- a/macro/rich/alignment/gauss_distrib/run_sim.C
+++ b/macro/rich/alignment/gauss_distrib/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/gauss_distrib/scaleHistos.C b/macro/rich/alignment/gauss_distrib/scaleHistos.C
index e5f8b45283..c9143d13ae 100644
--- a/macro/rich/alignment/gauss_distrib/scaleHistos.C
+++ b/macro/rich/alignment/gauss_distrib/scaleHistos.C
@@ -1,7 +1,5 @@
-/** @file scaleHistos.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TH3D.h"
+
 #include <string>
 
 int Counter   = 0;
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 9de6068cb0..eb474df036 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,6 +1,3 @@
-/** @file run_mirror_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco(Int_t nEvents = 50)
 {
   TTree::SetMaxTreeSize(90000000000);
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 74778bc8a7..976ea4b397 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,6 +1,3 @@
-/** @file run_mirror_reco_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco_alignment(Int_t nEvents = 2000)
 {
   TTree::SetMaxTreeSize(90000000000);
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 c96ef7db7c..83448bfe17 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,6 +1,3 @@
-/** @file run_mirror_reco_alignment_test.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco_alignment_test(Int_t nEvents = 5000, TString tile = "", TString axis = "", TString numb = "")
 {
   TTree::SetMaxTreeSize(90000000000);
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 1b7345213b..abf9fdb394 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,6 +1,3 @@
-/** @file run_mirror_reco_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco_correction(Int_t nEvents = 2000)
 {
   TTree::SetMaxTreeSize(90000000000);
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 0ab588c108..dafceaf92a 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,6 +1,3 @@
-/** @file run_mirror_reco_correction_test.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco_correction_test(Int_t nEvents = 5000, TString tile = "", TString axis = "", TString numb = "")
 {
   TTree::SetMaxTreeSize(90000000000);
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 7241631ac6..9a90e3bde4 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,6 +1,3 @@
-/** @file run_mirror_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 c5aceaa8d3..ce8711c330 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,6 +1,3 @@
-/** @file run_mirror_sim_test.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 977223f83f..76216d1ae2 100644
--- a/macro/rich/alignment/matching/Analyze_matching.C
+++ b/macro/rich/alignment/matching/Analyze_matching.C
@@ -1,8 +1,6 @@
-/** @file Analyze_matching.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iomanip>
 #include <vector>
+
 #include <Analyze_matching.h>
 
 /* Draw histograms of radius, dR, a, b and b over a, on a same canvass. */
diff --git a/macro/rich/alignment/matching/Analyze_matching.h b/macro/rich/alignment/matching/Analyze_matching.h
index d29e1c6b26..9664bbb52f 100644
--- a/macro/rich/alignment/matching/Analyze_matching.h
+++ b/macro/rich/alignment/matching/Analyze_matching.h
@@ -1,7 +1,5 @@
-/** @file Analyze_matching.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 char HistText[256];
+
 TFile* ParFile;
 TFile* SimFile;
 TFile* RecFile;
diff --git a/macro/rich/alignment/matching/calc.C b/macro/rich/alignment/matching/calc.C
index 7c6013c7b5..56a30065af 100644
--- a/macro/rich/alignment/matching/calc.C
+++ b/macro/rich/alignment/matching/calc.C
@@ -1,6 +1,3 @@
-/** @file calc.C
-  * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void calc(Double_t x, Double_t y, Double_t z)
 {
   Double_t rho = 0., theta = 0., phi = 0.;
diff --git a/macro/rich/alignment/matching/eventDisplay.C b/macro/rich/alignment/matching/eventDisplay.C
index 03f870c9bc..659c04a560 100644
--- a/macro/rich/alignment/matching/eventDisplay.C
+++ b/macro/rich/alignment/matching/eventDisplay.C
@@ -1,8 +1,6 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay(const char* setup = "sis100_electron")
 {
+
   TString dataDir   = "data/";
   TString InputFile = dataDir + setup + "_test.mc.root";
   TString ParFile   = dataDir + setup + "_params.root";
diff --git a/macro/rich/alignment/matching/run_reco_matching.C b/macro/rich/alignment/matching/run_reco_matching.C
index c0ecf49ae9..0325ff6331 100644
--- a/macro/rich/alignment/matching/run_reco_matching.C
+++ b/macro/rich/alignment/matching/run_reco_matching.C
@@ -1,6 +1,3 @@
-/** @file run_reco_matching.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/matching/run_reco_matching_alignment.C b/macro/rich/alignment/matching/run_reco_matching_alignment.C
index 100eec021a..3b79a81d7e 100644
--- a/macro/rich/alignment/matching/run_reco_matching_alignment.C
+++ b/macro/rich/alignment/matching/run_reco_matching_alignment.C
@@ -1,6 +1,3 @@
-/** @file run_reco_matching_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/matching/run_reco_matching_correction.C b/macro/rich/alignment/matching/run_reco_matching_correction.C
index 0a1e455208..8e39a914d7 100644
--- a/macro/rich/alignment/matching/run_reco_matching_correction.C
+++ b/macro/rich/alignment/matching/run_reco_matching_correction.C
@@ -1,6 +1,3 @@
-/** @file run_reco_matching_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/matching/run_sim_matching.C b/macro/rich/alignment/matching/run_sim_matching.C
index 64c5270034..251ee412da 100644
--- a/macro/rich/alignment/matching/run_sim_matching.C
+++ b/macro/rich/alignment/matching/run_sim_matching.C
@@ -1,6 +1,3 @@
-/** @file run_sim_matching.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/matching/run_sim_matching2.C b/macro/rich/alignment/matching/run_sim_matching2.C
index 3f78d61ef3..45ca212759 100644
--- a/macro/rich/alignment/matching/run_sim_matching2.C
+++ b/macro/rich/alignment/matching/run_sim_matching2.C
@@ -1,6 +1,3 @@
-/** @file run_sim_matching2.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/position/Compute_distance.C b/macro/rich/alignment/position/Compute_distance.C
index 3c9ea8a135..a2bb4bdd65 100644
--- a/macro/rich/alignment/position/Compute_distance.C
+++ b/macro/rich/alignment/position/Compute_distance.C
@@ -1,8 +1,6 @@
-/** @file Compute_distance.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iomanip>
 #include <vector>
+
 #include <Compute_distance.h>
 //#include <TH3D.h>
 
diff --git a/macro/rich/alignment/position/Compute_distance.h b/macro/rich/alignment/position/Compute_distance.h
index a46a5ce95a..bb6cdc1f02 100644
--- a/macro/rich/alignment/position/Compute_distance.h
+++ b/macro/rich/alignment/position/Compute_distance.h
@@ -1,7 +1,5 @@
-/** @file Compute_distance.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 char HistText[256];
+
 TFile* ParFile;
 TFile* SimFile;
 TFile* RecFile;
diff --git a/macro/rich/alignment/position/calc.C b/macro/rich/alignment/position/calc.C
index 7c6013c7b5..56a30065af 100644
--- a/macro/rich/alignment/position/calc.C
+++ b/macro/rich/alignment/position/calc.C
@@ -1,6 +1,3 @@
-/** @file calc.C
-  * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void calc(Double_t x, Double_t y, Double_t z)
 {
   Double_t rho = 0., theta = 0., phi = 0.;
diff --git a/macro/rich/alignment/position/eventDisplay.C b/macro/rich/alignment/position/eventDisplay.C
index 03f870c9bc..659c04a560 100644
--- a/macro/rich/alignment/position/eventDisplay.C
+++ b/macro/rich/alignment/position/eventDisplay.C
@@ -1,8 +1,6 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay(const char* setup = "sis100_electron")
 {
+
   TString dataDir   = "data/";
   TString InputFile = dataDir + setup + "_test.mc.root";
   TString ParFile   = dataDir + setup + "_params.root";
diff --git a/macro/rich/alignment/position/run_reco_position.C b/macro/rich/alignment/position/run_reco_position.C
index 06996cd6eb..c4200703b1 100644
--- a/macro/rich/alignment/position/run_reco_position.C
+++ b/macro/rich/alignment/position/run_reco_position.C
@@ -1,6 +1,3 @@
-/** @file run_reco_position.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_position(Int_t nEvents = 500000, Int_t Flag = 0)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/position/run_reco_position2.C b/macro/rich/alignment/position/run_reco_position2.C
index 18286ba34a..4c7e5cea0f 100644
--- a/macro/rich/alignment/position/run_reco_position2.C
+++ b/macro/rich/alignment/position/run_reco_position2.C
@@ -1,6 +1,3 @@
-/** @file run_reco_position2.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/position/run_reco_position3.C b/macro/rich/alignment/position/run_reco_position3.C
index 5799af2491..4b3fcff9db 100644
--- a/macro/rich/alignment/position/run_reco_position3.C
+++ b/macro/rich/alignment/position/run_reco_position3.C
@@ -1,6 +1,3 @@
-/** @file run_reco_position3.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/position/run_reco_position4.C b/macro/rich/alignment/position/run_reco_position4.C
index e4d939ed29..c5e656845a 100644
--- a/macro/rich/alignment/position/run_reco_position4.C
+++ b/macro/rich/alignment/position/run_reco_position4.C
@@ -1,6 +1,3 @@
-/** @file run_reco_position4.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/position/run_reco_position_old.C b/macro/rich/alignment/position/run_reco_position_old.C
index acd954e7d5..5d22c570e4 100644
--- a/macro/rich/alignment/position/run_reco_position_old.C
+++ b/macro/rich/alignment/position/run_reco_position_old.C
@@ -1,6 +1,3 @@
-/** @file run_reco_position_old.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_position(Int_t nEvents = 500000, TString numb = "00001", Int_t Flag = 0)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/position/run_sim_position.C b/macro/rich/alignment/position/run_sim_position.C
index debc7d3780..fd8e5d9920 100644
--- a/macro/rich/alignment/position/run_sim_position.C
+++ b/macro/rich/alignment/position/run_sim_position.C
@@ -1,6 +1,3 @@
-/** @file run_sim_position.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim_position(Int_t nEvents = 100, Int_t Flag = 0)
 {
   //TEST//
diff --git a/macro/rich/alignment/position/run_sim_position2.C b/macro/rich/alignment/position/run_sim_position2.C
index edaeec81b7..a13440fe98 100644
--- a/macro/rich/alignment/position/run_sim_position2.C
+++ b/macro/rich/alignment/position/run_sim_position2.C
@@ -1,6 +1,3 @@
-/** @file run_sim_position2.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString caveGeom;
 static TString pipeGeom;
 static TString magnetGeom;
diff --git a/macro/rich/alignment/position/run_sim_position3.C b/macro/rich/alignment/position/run_sim_position3.C
index 647c78e0c1..49992ffd35 100644
--- a/macro/rich/alignment/position/run_sim_position3.C
+++ b/macro/rich/alignment/position/run_sim_position3.C
@@ -1,6 +1,3 @@
-/** @file run_sim_position3.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/position/run_sim_position4.C b/macro/rich/alignment/position/run_sim_position4.C
index 83e6a70ab5..aede9a7bc5 100644
--- a/macro/rich/alignment/position/run_sim_position4.C
+++ b/macro/rich/alignment/position/run_sim_position4.C
@@ -1,6 +1,3 @@
-/** @file run_sim_position4.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/alignment/position/run_sim_position_old.C b/macro/rich/alignment/position/run_sim_position_old.C
index 6d3bcf6a49..f6d0c6cf75 100644
--- a/macro/rich/alignment/position/run_sim_position_old.C
+++ b/macro/rich/alignment/position/run_sim_position_old.C
@@ -1,6 +1,3 @@
-/** @file run_sim_position_old.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim_position(Int_t nEvents = 200000, TString numb = "00001", Int_t Flag = 0)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_alignment_reco.C b/macro/rich/alignment/run_alignment_reco.C
index c76edfae93..997dddcad3 100644
--- a/macro/rich/alignment/run_alignment_reco.C
+++ b/macro/rich/alignment/run_alignment_reco.C
@@ -1,6 +1,3 @@
-/** @file run_alignment_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_alignment_reco(Int_t nEvents = 5000, TString Rot = "5")
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_correction_reco.C b/macro/rich/alignment/run_correction_reco.C
index 573cfa512e..0f49d58f51 100644
--- a/macro/rich/alignment/run_correction_reco.C
+++ b/macro/rich/alignment/run_correction_reco.C
@@ -1,6 +1,3 @@
-/** @file run_correction_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_correction_reco(Int_t nEvents = 5000, TString Rot = "5")
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_mirror_reco.C b/macro/rich/alignment/run_mirror_reco.C
index 9de6068cb0..eb474df036 100644
--- a/macro/rich/alignment/run_mirror_reco.C
+++ b/macro/rich/alignment/run_mirror_reco.C
@@ -1,6 +1,3 @@
-/** @file run_mirror_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco(Int_t nEvents = 50)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_mirror_reco_alignment.C b/macro/rich/alignment/run_mirror_reco_alignment.C
index 74778bc8a7..976ea4b397 100644
--- a/macro/rich/alignment/run_mirror_reco_alignment.C
+++ b/macro/rich/alignment/run_mirror_reco_alignment.C
@@ -1,6 +1,3 @@
-/** @file run_mirror_reco_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_mirror_reco_alignment(Int_t nEvents = 2000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_mirror_reco_correction.C b/macro/rich/alignment/run_mirror_reco_correction.C
index 6590cc6e20..1a63b31ac8 100644
--- a/macro/rich/alignment/run_mirror_reco_correction.C
+++ b/macro/rich/alignment/run_mirror_reco_correction.C
@@ -1,7 +1,5 @@
-/** @file run_mirror_reco_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 using namespace std;
+
 void run_mirror_reco_correction(Int_t nEvents = 2000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_mirror_sim.C b/macro/rich/alignment/run_mirror_sim.C
index 4c82b166c1..1dc9871218 100644
--- a/macro/rich/alignment/run_mirror_sim.C
+++ b/macro/rich/alignment/run_mirror_sim.C
@@ -1,6 +1,3 @@
-/** @file run_mirror_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 29507a0b3c..752e3d1781 100644
--- a/macro/rich/alignment/run_reco.C
+++ b/macro/rich/alignment/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco(Int_t nEvents = 5000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/alignment/run_sim.C b/macro/rich/alignment/run_sim.C
index 9667748b15..c16c638c50 100644
--- a/macro/rich/alignment/run_sim.C
+++ b/macro/rich/alignment/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 839fa9ac25..b47bba654e 100644
--- a/macro/rich/alignment/single_tile/eventDisplay.C
+++ b/macro/rich/alignment/single_tile/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay()
 {
   TString dataDir = "/data/Sim_Outputs/Event_Display/plusY/";
diff --git a/macro/rich/alignment/single_tile/run_reco.C b/macro/rich/alignment/single_tile/run_reco.C
index 5f937b89e2..cdeb8c75a1 100644
--- a/macro/rich/alignment/single_tile/run_reco.C
+++ b/macro/rich/alignment/single_tile/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/single_tile/run_reco_alignment.C b/macro/rich/alignment/single_tile/run_reco_alignment.C
index 922017b99b..d5c816d7cb 100644
--- a/macro/rich/alignment/single_tile/run_reco_alignment.C
+++ b/macro/rich/alignment/single_tile/run_reco_alignment.C
@@ -1,6 +1,3 @@
-/** @file run_reco_alignment.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/single_tile/run_reco_correction.C b/macro/rich/alignment/single_tile/run_reco_correction.C
index 14c109d617..2c00b90027 100644
--- a/macro/rich/alignment/single_tile/run_reco_correction.C
+++ b/macro/rich/alignment/single_tile/run_reco_correction.C
@@ -1,6 +1,3 @@
-/** @file run_reco_correction.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 TString caveGeom     = "";
 TString pipeGeom     = "";
 TString magnetGeom   = "";
diff --git a/macro/rich/alignment/single_tile/run_sim.C b/macro/rich/alignment/single_tile/run_sim.C
index 9943a75d37..df616b1e66 100644
--- a/macro/rich/alignment/single_tile/run_sim.C
+++ b/macro/rich/alignment/single_tile/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/cbmlibs.C b/macro/rich/cbmlibs.C
index 0ed577d97b..1765b10c0a 100644
--- a/macro/rich/cbmlibs.C
+++ b/macro/rich/cbmlibs.C
@@ -1,8 +1,6 @@
-/** @file cbmlibs.C
-  * @copyright Copyright (C) 2009-2013 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void cbmlibs()
 {
+
   gSystem->Load("libboost_regex");
   gSystem->Load("libboost_regex");
 
diff --git a/macro/rich/create_RICH_geo_file.C b/macro/rich/create_RICH_geo_file.C
index 50433b51cc..f8b5ddc55b 100644
--- a/macro/rich/create_RICH_geo_file.C
+++ b/macro/rich/create_RICH_geo_file.C
@@ -1,6 +1,3 @@
-/** @file create_RICH_geo_file.C
-  * @copyright Copyright (C) 2006-2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void create_RICH_geo_file(char* geometry = "rich-2900-N2-0")
 {
   char infile[256];   // geometry data file - input
diff --git a/macro/rich/create_rich_geo_with_mirror_misalignment.C b/macro/rich/create_rich_geo_with_mirror_misalignment.C
index 3ff95749d9..63cbcffa23 100644
--- a/macro/rich/create_rich_geo_with_mirror_misalignment.C
+++ b/macro/rich/create_rich_geo_with_mirror_misalignment.C
@@ -1,6 +1,3 @@
-/** @file create_rich_geo_with_mirror_misalignment.C
-  * @copyright Copyright (C) 2014 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 3ee6c75777..e1f279507c 100644
--- a/macro/rich/d0/run_d0.C
+++ b/macro/rich/d0/run_d0.C
@@ -1,8 +1,6 @@
-/** @file run_d0.C
-  * @copyright Copyright (C) 2015-2021 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
 using namespace std;
+
 double radius         = 200;  //in pixels
 double deltaR         = 1.0;  // in pixels
 double thresholdCoeff = 1.1;
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
index ad62fa06c5..b22e9d1a52 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfileNew.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfileNew(float PMTrotX = 5, float PMTrotY = 5, int RotMir = -10)
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
index 15c8825936..c14eb857ec 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfileNew_Dec2014.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfileNew(float PMTrotX = 5, float PMTrotY = 5, int RotMir = -10)
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
index 68ee7e72ac..22c0cf55fb 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfileOld.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfileOld(float PMTrotX = 5, float PMTrotY = -5, int RotMir = -10)
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
index 0420172d3a..acbcb3ff2f 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfile_April2015.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfile_April2015(float PMTrotX = 5, float PMTrotY = 5, int RotMir = -10)
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
index 2d00889630..16f88d4d19 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfile_April2015_ModAug2015.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfile_April2015_ModAug2015(float pmt_pos_y_addend = 0, float pmt_pos_z_addend = 0, int RotMir = -10,
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
index 312b048aed..4207461abe 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfile_April2015_ModOct2015.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfile_April2015_ModOct2015(float pmt_pos_y_addend = 0, float pmt_pos_z_addend = 0, int RotMir = -10,
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
index 231f326e92..a8193d4e6e 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfile_ExtMirrOct2015.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfile_ExtMirrOct2015(float pmt_pos_y_addend = 10, float pmt_pos_z_addend = 80, int RotMir = -10,
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
index e420817d36..1e2db11d71 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
@@ -1,6 +1,3 @@
-/** @file CreateInputForGeo.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateInputForGeo(float PMTrotX = 5., float PMTrotY = 5.)
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
index 475cca726f..ed6c385baa 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
@@ -1,6 +1,3 @@
-/** @file CreateReducedGDMLfileNew.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateReducedGDMLfileNew(float PMTrotX = 5, float PMTrotY = 5, int RotMir = -10)
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 120ff71a79..b14cafd728 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C
@@ -1,8 +1,6 @@
-/** @file create_RICH_geo_file.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void create_RICH_geo_file(float PMTrotX = 5., float PMTrotY = 5.)
 {  //char *geometry="rich-2900-N2-0"){
+
   int ShiftXmod10     = (int(PMTrotX * 10)) % 10;
   float IntegerXValue = PMTrotX - (float(ShiftXmod10)) / 10.;
   int ShiftYmod10     = (int(PMTrotY * 10)) % 10;
diff --git a/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C b/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
index 04c4d9b74e..e745314b60 100644
--- a/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
+++ b/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
@@ -1,6 +1,3 @@
-/** @file Run_Ana_GeoOpt_Batch.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void Run_Ana_GeoOpt_Batch(Int_t nEvents = 10)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C b/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
index 3ed614bcf4..7c4019ca2b 100644
--- a/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
+++ b/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
@@ -1,8 +1,6 @@
-/** @file Run_Reco_GeoOpt_Batch.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void Run_Reco_GeoOpt_Batch(Int_t nEvents = 1)
 {
+
   TTree::SetMaxTreeSize(90000000000);
   gRandom->SetSeed(10);
 
diff --git a/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C b/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
index d7afac1866..aa0c7ef202 100644
--- a/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
+++ b/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
@@ -1,8 +1,6 @@
-/** @file Run_Sim_GeoOpt_Batch.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void Run_Sim_GeoOpt_Batch(Int_t nEvents = 1)
 {
+
   float PMTrotX = 20, PMTrotY = 10;
   int PMTtransY = -40, PMTtransZ = 80;
   float ThetaMin = 250., ThetaMax = 2500.;  //devide by 100 later
diff --git a/macro/rich/geotest/RotPMT/eventDisplay.C b/macro/rich/geotest/RotPMT/eventDisplay.C
index cb408aadc4..347bd18f94 100644
--- a/macro/rich/geotest/RotPMT/eventDisplay.C
+++ b/macro/rich/geotest/RotPMT/eventDisplay.C
@@ -1,6 +1,5 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void eventDisplay(int PMTrotX = 10, int PMTrotY = 15, int RotMir = 1)
 {
   int GeoCase = 2;
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C b/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
index 5aafd1be7a..bb8631b279 100644
--- a/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
+++ b/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
@@ -1,6 +1,3 @@
-/** @file CreateGDMLfile_April2015.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateGDMLfile_April2015(float PMTrotX = 5, float PMTrotY = 5, int RotMir = -10)
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C b/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
index 26d67b36f6..f7e0954d07 100644
--- a/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
+++ b/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
@@ -1,6 +1,3 @@
-/** @file CreateTransGDMLfile_April2015.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 void CreateTransGDMLfile_April2015(float pmt_pos_y_addend = 0, float pmt_pos_z_addend = 0, int RotMir = -10,
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 8935495876..84839589d9 100644
--- a/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
+++ b/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
@@ -1,6 +1,3 @@
-/** @file GDML_to_ROOT_Trans.C
-  * @copyright Copyright (C) 2015-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 4c74c04117..7a5025a8b6 100644
--- a/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C
+++ b/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C
@@ -1,6 +1,3 @@
-/** @file Run_Ana_GeoOpt_Batch.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 d2a1ec171f..d5c96381b7 100644
--- a/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C
+++ b/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C
@@ -1,6 +1,3 @@
-/** @file Run_Reco_GeoOpt_Batch.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 16eddd1838..2d0baa750e 100644
--- a/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C
+++ b/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C
@@ -1,6 +1,3 @@
-/** @file Run_Sim_GeoOpt_Batch.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 f14e7896b9..d8f95c89eb 100644
--- a/macro/rich/geotest/geoopt/create_geos.C
+++ b/macro/rich/geotest/geoopt/create_geos.C
@@ -1,6 +1,3 @@
-/** @file create_geos.C
-  * @copyright Copyright (C) 2019 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <fstream>
 #include <iostream>
 #include <iterator>
diff --git a/macro/rich/geotest/geoopt/run_geotest_opt.C b/macro/rich/geotest/geoopt/run_geotest_opt.C
index 02ac02eac7..89f29d1c5e 100644
--- a/macro/rich/geotest/geoopt/run_geotest_opt.C
+++ b/macro/rich/geotest/geoopt/run_geotest_opt.C
@@ -1,6 +1,3 @@
-/** @file run_geotest_opt.C
-  * @copyright Copyright (C) 2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_geotest_opt()
 {
   int mirrorRotation    = 10;
diff --git a/macro/rich/geotest/run_ana_geo_opt.C b/macro/rich/geotest/run_ana_geo_opt.C
index b27c9a811e..1841a974bd 100644
--- a/macro/rich/geotest/run_ana_geo_opt.C
+++ b/macro/rich/geotest/run_ana_geo_opt.C
@@ -1,6 +1,4 @@
-/** @file run_ana_geo_opt.C
-  * @copyright Copyright (C) 2014 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_ana_geo_opt(Int_t nEvents = 200)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/geotest/run_digi_geotest.C b/macro/rich/geotest/run_digi_geotest.C
index 37ef128cf1..c3b4640118 100644
--- a/macro/rich/geotest/run_digi_geotest.C
+++ b/macro/rich/geotest/run_digi_geotest.C
@@ -1,6 +1,3 @@
-/** @file run_digi_geotest.C
-  * @copyright Copyright (C) 2018-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
                       const string& digiFile = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/digi.00000.root",
diff --git a/macro/rich/geotest/run_digi_urqmdtest.C b/macro/rich/geotest/run_digi_urqmdtest.C
index f2e6b78d99..eb0631b885 100644
--- a/macro/rich/geotest/run_digi_urqmdtest.C
+++ b/macro/rich/geotest/run_digi_urqmdtest.C
@@ -1,6 +1,3 @@
-/** @file run_digi_urqmdtest.C
-  * @copyright Copyright (C) 2018-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_digi_urqmdtest(
   const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/mc.00000.root",
   const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/param.00000.root",
diff --git a/macro/rich/geotest/run_qa_geotest.C b/macro/rich/geotest/run_qa_geotest.C
index 1d38262e71..d4c21197a9 100644
--- a/macro/rich/geotest/run_qa_geotest.C
+++ b/macro/rich/geotest/run_qa_geotest.C
@@ -1,6 +1,4 @@
-/** @file run_qa_geotest.C
-  * @copyright Copyright (C) 2019-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 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",
                     const string& digiFile = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/digi.00000.root",
diff --git a/macro/rich/geotest/run_qa_urqmdtest.C b/macro/rich/geotest/run_qa_urqmdtest.C
index 2de3c2fc1e..642716e447 100644
--- a/macro/rich/geotest/run_qa_urqmdtest.C
+++ b/macro/rich/geotest/run_qa_urqmdtest.C
@@ -1,6 +1,3 @@
-/** @file run_qa_urqmdtest.C
-  * @copyright Copyright (C) 2019-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_qa_urqmdtest(
   const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/mc.00000.root",
   const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/param.00000.root",
diff --git a/macro/rich/geotest/run_reco_geo_opt.C b/macro/rich/geotest/run_reco_geo_opt.C
index e2af788fe3..a7a9a44f03 100644
--- a/macro/rich/geotest/run_reco_geo_opt.C
+++ b/macro/rich/geotest/run_reco_geo_opt.C
@@ -1,6 +1,4 @@
-/** @file run_reco_geo_opt.C
-  * @copyright Copyright (C) 2014-2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_reco_geo_opt(Int_t nEvents = 30000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/geotest/run_reco_geotest.C b/macro/rich/geotest/run_reco_geotest.C
index dbc9858a5a..2183b8d9e6 100644
--- a/macro/rich/geotest/run_reco_geotest.C
+++ b/macro/rich/geotest/run_reco_geotest.C
@@ -1,6 +1,4 @@
-/** @file run_reco_geotest.C
-  * @copyright Copyright (C) 2009-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 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",
                       const string& digiFile = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/digi.00000.root",
diff --git a/macro/rich/geotest/run_reco_urqmdtest.C b/macro/rich/geotest/run_reco_urqmdtest.C
index 2b8dae0fdf..9d79e31d40 100644
--- a/macro/rich/geotest/run_reco_urqmdtest.C
+++ b/macro/rich/geotest/run_reco_urqmdtest.C
@@ -1,6 +1,3 @@
-/** @file run_reco_urqmdtest.C
-  * @copyright Copyright (C) 2013-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_urqmdtest(
   const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/mc.00000.root",
   const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/param.00000.root",
diff --git a/macro/rich/geotest/run_sim_geo_opt.C b/macro/rich/geotest/run_sim_geo_opt.C
index fcd3a49bc2..3069c90f3f 100644
--- a/macro/rich/geotest/run_sim_geo_opt.C
+++ b/macro/rich/geotest/run_sim_geo_opt.C
@@ -1,6 +1,3 @@
-/** @file run_sim_geo_opt.C
-  * @copyright Copyright (C) 2014 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim_geo_opt(Int_t nEvents = 200)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/geotest/run_sim_geotest.C b/macro/rich/geotest/run_sim_geotest.C
index 88764f1fc7..096f303210 100644
--- a/macro/rich/geotest/run_sim_geotest.C
+++ b/macro/rich/geotest/run_sim_geotest.C
@@ -1,6 +1,3 @@
-/** @file run_sim_geotest.C
-  * @copyright Copyright (C) 2009-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
                      const string& parFile   = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/param.00000.root",
diff --git a/macro/rich/geotest/run_sim_urqmdtest.C b/macro/rich/geotest/run_sim_urqmdtest.C
index b31dcc21fa..6d6925ec27 100644
--- a/macro/rich/geotest/run_sim_urqmdtest.C
+++ b/macro/rich/geotest/run_sim_urqmdtest.C
@@ -1,6 +1,3 @@
-/** @file run_sim_urqmdtest.C
-  * @copyright Copyright (C) 2013-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim_urqmdtest(
   const string& urqmdFile = "/Users/slebedev/Development/cbm/data/urqmd/auau/"
                             "8gev/centr/urqmd.auau.8gev.centr.00001.root",
diff --git a/macro/rich/mcbm/beamtime/run_aerogel_analysis.C b/macro/rich/mcbm/beamtime/run_aerogel_analysis.C
index dfb1331149..f80e619786 100644
--- a/macro/rich/mcbm/beamtime/run_aerogel_analysis.C
+++ b/macro/rich/mcbm/beamtime/run_aerogel_analysis.C
@@ -1,6 +1,3 @@
-/** @file run_aerogel_analysis.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_aerogel_analysis(const string& parFile = "/lustre/cbm/users/adrian/cbmgitnew/cbmsource/macro/"
                                                   "beamtime/mcbm2020/data/unp_mcbm_params_598.root",
                           const string& digiFile = "/lustre/cbm/users/adrian/cbmgitnew/cbmsource/macro/"
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C
index a26257b92f..75a0464704 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C
@@ -1,6 +1,4 @@
-/** @file run_reco_mcbm_real.C
-  * @copyright Copyright (C) 2019 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 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",
                         const string& recoFile = "reco_mcbm.root", int nEvents = 10)
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 a035e78c9e..9c0b6aba1c 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void run_reco_mcbm_real_wToF(
   //     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_dec19.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_dec19.C
index 855569a64e..89e5939359 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,6 +1,3 @@
-/** @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 **/
 void run_reco_mcbm_real_wToF_dec19(
   //        const string& parFile  = "/lustre/nyx/cbm/users/adrian/data19Dec12/testNew2/unp_mcbm_params_384.root",
   //        const string& digiFile = "/lustre/nyx/cbm/users/adrian/data19Dec12/testNew2/unp_mcbm_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 b417e06a9d..da151a8f4d 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,6 +1,3 @@
-/** @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 **/
 void run_reco_mcbm_real_wToF_mar20(const string srcfolder = "/lustre/cbm/users/adrian/mcbmbeamtime/cbmsource/"
                                                             "macro/beamtime/mcbm2020/data",
                                    const unsigned int runId = 831,  // used for the output folder
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 3d4b68626f..3726ba1556 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,6 +1,3 @@
-/** @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 **/
 void run_reco_mcbm_real_wToF_nov19(
   const string& parFile  = "/lustre/nyx/cbm/users/adrian/data/nov19/unp_mcbm_params_370.root",
   const string& digiFile = "/lustre/nyx/cbm/users/adrian/data/nov19/unp_mcbm_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 4cf39ecf5e..37a0d60e97 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C
@@ -1,6 +1,4 @@
-/** @file run_reco_mcbm_richOnly.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_reco_mcbm_richOnly(
   const string srcfolder   = "/lustre/cbm/users/adrian/cbmgitnew/cbmsource/macro/beamtime/mcbm2020/data",
   const unsigned int runId = 790,  // used for the output folder
diff --git a/macro/rich/mcbm/drawHistos.C b/macro/rich/mcbm/drawHistos.C
index e52a0f3784..f1fdf22b9c 100644
--- a/macro/rich/mcbm/drawHistos.C
+++ b/macro/rich/mcbm/drawHistos.C
@@ -1,6 +1,3 @@
-/** @file drawHistos.C
-  * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void drawHistos(TString inFilename = "~/TSA_files/result/test60001.root")
 {
   TFile* inFile = new TFile(inFilename, "READ");
diff --git a/macro/rich/mcbm/draw_mcbm_rich_qa.C b/macro/rich/mcbm/draw_mcbm_rich_qa.C
index f9393b7136..6444b9896f 100644
--- a/macro/rich/mcbm/draw_mcbm_rich_qa.C
+++ b/macro/rich/mcbm/draw_mcbm_rich_qa.C
@@ -1,6 +1,3 @@
-/** @file draw_mcbm_rich_qa.C
-  * @copyright Copyright (C) 2018 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_mcbm_rich_qa()
 {
   std::string outputDir = "results_mcbm_rich_qa/";
diff --git a/macro/rich/mcbm/eventDisplay.C b/macro/rich/mcbm/eventDisplay.C
index 9dfb9ec15a..83aaefa356 100644
--- a/macro/rich/mcbm/eventDisplay.C
+++ b/macro/rich/mcbm/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //void eventDisplay(const char* setup = "sis18_mcbm_25deg")
 //void eventDisplay(const char* setup = "sis18_mcbm_20deg_short")
 void eventDisplay(const char* setup = "sis18_mcbm_20deg_long")
diff --git a/macro/rich/mcbm/mcbm_mc_gp.C b/macro/rich/mcbm/mcbm_mc_gp.C
index 63746cd465..12991f75b6 100644
--- a/macro/rich/mcbm/mcbm_mc_gp.C
+++ b/macro/rich/mcbm/mcbm_mc_gp.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc_gp.C
-  * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/rich/mcbm/mcbm_reco_gp.C b/macro/rich/mcbm/mcbm_reco_gp.C
index 3af87cef45..e468d29aa9 100644
--- a/macro/rich/mcbm/mcbm_reco_gp.C
+++ b/macro/rich/mcbm/mcbm_reco_gp.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco_gp.C
-  * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/rich/mcbm/run_reco_mcbm.C b/macro/rich/mcbm/run_reco_mcbm.C
index 9898fdc170..63ca2659df 100644
--- a/macro/rich/mcbm/run_reco_mcbm.C
+++ b/macro/rich/mcbm/run_reco_mcbm.C
@@ -1,8 +1,6 @@
-/** @file run_reco_mcbm.C
-  * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_mcbm(Int_t nEvents = 1000)
 {
+
   TTree::SetMaxTreeSize(90000000000);
   TString script = TString(gSystem->Getenv("SCRIPT"));
 
diff --git a/macro/rich/mcbm/run_sim_mcbm.C b/macro/rich/mcbm/run_sim_mcbm.C
index 50fa508227..6daf2ce240 100644
--- a/macro/rich/mcbm/run_sim_mcbm.C
+++ b/macro/rich/mcbm/run_sim_mcbm.C
@@ -1,6 +1,4 @@
-/** @file run_sim_mcbm.C
-  * @copyright Copyright (C) 2018-2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_sim_mcbm(Int_t nEvents = 10)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/mcbm/test_daq.C b/macro/rich/mcbm/test_daq.C
index 97bc75a3b7..e239f5f187 100644
--- a/macro/rich/mcbm/test_daq.C
+++ b/macro/rich/mcbm/test_daq.C
@@ -1,6 +1,3 @@
-/** @file test_daq.C
-  * @copyright Copyright (C) 2018-2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 c46009c6a6..03ee8ca0df 100644
--- a/macro/rich/mirrors/run_ronchi.C
+++ b/macro/rich/mirrors/run_ronchi.C
@@ -1,6 +1,3 @@
-/** @file run_ronchi.C
-  * @copyright Copyright (C) 2018-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_ronchi()
 {
   //gSystem->Load("libCbmRichMirrors");
diff --git a/macro/rich/prototype/PID.C b/macro/rich/prototype/PID.C
index 69a41022a9..6a5626b0a2 100644
--- a/macro/rich/prototype/PID.C
+++ b/macro/rich/prototype/PID.C
@@ -1,6 +1,5 @@
-/** @file PID.C
-  * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 {
   const Float_t el_a_min = 4.4;
   const Float_t el_a_max = 8.;
diff --git a/macro/rich/prototype/angle.C b/macro/rich/prototype/angle.C
index 2cbec778f9..ea3abfa2c4 100644
--- a/macro/rich/prototype/angle.C
+++ b/macro/rich/prototype/angle.C
@@ -1,7 +1,6 @@
-/** @file angle.C
-  * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "/misc/kresan/tools/drawStyle.C"
+
+
 const Double_t n       = 1.0004951;  //1.0004462;
 const Double_t mass_el = 0.000510998902;
 const Double_t mass_pi = 0.13957018;
diff --git a/macro/rich/prototype/beamtime/Fall2015/Correction_building/FilterMultiPeak.C b/macro/rich/prototype/beamtime/Fall2015/Correction_building/FilterMultiPeak.C
index b388eb5fe3..73dd279961 100644
--- a/macro/rich/prototype/beamtime/Fall2015/Correction_building/FilterMultiPeak.C
+++ b/macro/rich/prototype/beamtime/Fall2015/Correction_building/FilterMultiPeak.C
@@ -1,6 +1,3 @@
-/** @file FilterMultiPeak.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define THRESHOLD 45.  // Check the (un)commented code at the end of the macro
 #define KOEF 5         // Rebinning koef
 #define WINMIN 1.5     // ns
diff --git a/macro/rich/prototype/beamtime/Fall2015/Correction_building/buildDeltaTable.C b/macro/rich/prototype/beamtime/Fall2015/Correction_building/buildDeltaTable.C
index 93ad34c2d5..55a9f31c93 100644
--- a/macro/rich/prototype/beamtime/Fall2015/Correction_building/buildDeltaTable.C
+++ b/macro/rich/prototype/beamtime/Fall2015/Correction_building/buildDeltaTable.C
@@ -1,6 +1,3 @@
-/** @file buildDeltaTable.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Transform pair tdcId/ch into some unique ID [from 0 to 255]
 // Size of the matrix is fixed to 16*16
 UInt_t tdcAndChToID(UInt_t tdcId, UInt_t ch)
diff --git a/macro/rich/prototype/beamtime/Fall2015/Correction_building/entriesCounter_simple.C b/macro/rich/prototype/beamtime/Fall2015/Correction_building/entriesCounter_simple.C
index 9c47c4b00e..da728aad73 100644
--- a/macro/rich/prototype/beamtime/Fall2015/Correction_building/entriesCounter_simple.C
+++ b/macro/rich/prototype/beamtime/Fall2015/Correction_building/entriesCounter_simple.C
@@ -1,6 +1,3 @@
-/** @file entriesCounter_simple.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void entriesCounter_simple(TString filename = "alphas.root", TString picturesFolder = "pictures")
 {
   char LINE[256];
diff --git a/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/buildDeltaTable.C b/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/buildDeltaTable.C
index 585af4eba5..352d55182a 100644
--- a/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/buildDeltaTable.C
+++ b/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/buildDeltaTable.C
@@ -1,6 +1,3 @@
-/** @file buildDeltaTable.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Transform pair tdcId/ch into some unique ID [from 0 to 255]
 // Size of the matrix is fixed to 16*16
 UInt_t tdcAndChToID(UInt_t tdcId, UInt_t ch)
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 49739893c2..43f896bcdd 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,6 +1,3 @@
-/** @file entriesCounter_simple.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void entriesCounter_simple(TString filename = "alphas.root", TString picturesFolder = "pictures")
 {
   char LINE[256];
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C
index c97614ae01..a252cc786b 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C
@@ -1,6 +1,3 @@
-/** @file drawAllHisto3.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
 // ind = [0;15] - index of the canvas to plot
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C
index b0024a806e..3158d2aaaf 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C
@@ -1,6 +1,3 @@
-/** @file drawDist.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void drawDist(TString filename)
 {
   FILE* f = fopen(filename.Data(), "r");
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C
index cf508d995f..612258c63a 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C
@@ -1,6 +1,3 @@
-/** @file drawInTime.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void drawInTime(TString filename, Int_t num)
 {
   FILE* f = fopen(filename.Data(), "r");
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C
index 79889f2911..716f170b80 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C
@@ -1,8 +1,6 @@
-/** @file printMean.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
+
 void printMean(TString filename = "Wuppertal_analysis.histo.root", Int_t calib = 1)
 {
   TFile* f = new TFile(filename);
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis.C
index ef8875365b..be439f5529 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis.C
@@ -1,6 +1,3 @@
-/** @file run_analysis.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C
index 9926edca2a..1f5b8d8a20 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_calibrate.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C
index b86200f762..8af1820527 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_ringscan.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C
index e7c40b1bdd..5adc94fecd 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_ringscan2.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C
index c60d082796..43fe967ddd 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C
@@ -1,7 +1,5 @@
-/** @file FilterMultiPeak.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define THRESHOLD 50.
+
 void FilterMultiPeak(TString filename = "output/sum_WLS_off.root")
 {
   TFile f(filename, "UPDATE");
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C
index 737c8b7357..537f0c6f23 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C
@@ -1,6 +1,3 @@
-/** @file drawAlHistograms.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void drawAlHistograms(TString filename = "../output/sum_WLS_off.root", TString picturesFolder = "pictures")
 {
   TFile f(filename);
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C
index f834ad80ff..857b4cd0c9 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C
@@ -1,6 +1,3 @@
-/** @file drawAllHisto3.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
 // ind = [0;15] - index of the canvas to plot
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C
index ee837cc2a6..857b4cd0c9 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C
@@ -1,6 +1,3 @@
-/** @file drawAllHisto4.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
 // ind = [0;15] - index of the canvas to plot
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C
index ba93358907..c70feb7554 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C
@@ -1,7 +1,5 @@
-/** @file drawNonShityHistos.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define THRESHOLD 35.
+
 #define KOEF 2  // Rebinning koef
 
 void drawNonShityHistos(TString filename = "../output/sum_WLS_off.root", TString picturesFolder = "pictures")
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 bd3a01dedd..01568c8a5f 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/draw_overlap.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/draw_overlap.C
@@ -1,6 +1,3 @@
-/** @file draw_overlap.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 7cc366922a..ecae1ea5fb 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/entriesCounter.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/entriesCounter.C
@@ -1,6 +1,3 @@
-/** @file entriesCounter.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void entriesCounter(TString filename = "../output/sum_WLS_off.root")
 {
   TFile f(filename, "UPDATE");
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C
index 48da9b050e..6ece97226a 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C
@@ -1,6 +1,3 @@
-/** @file histoRemove.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void histoRemove(TString filename, TString histoname)
 {
   TFile f(filename, "UPDATE");
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C
index 006488b14d..0c85c3a96f 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C
@@ -1,6 +1,3 @@
-/** @file testtest.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void testtest()
 {
   TString tdcIDs[16];
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C b/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C
index 42b90e86cc..454a4a49bd 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C
@@ -1,6 +1,3 @@
-/** @file doDraw.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void doDraw(int tdc, int ch)
 {
   TFile* f = new TFile("output/Wuppertal_analysis.histo.root", "READ");
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/doScan.C b/macro/rich/prototype/beamtime/NewUnpacker/doScan.C
index a5d03a6fcf..6ee667eccc 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/doScan.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/doScan.C
@@ -1,7 +1,5 @@
-/** @file doScan.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #!/ bin / bash
+
 cd ~ / cbmroot_may2015_devel / build / make Rich make_return_code = $ ? cd -
 
 #Break execution if CbmRoot build was not succesfull
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C
index a1be4b39d4..030f8f7e56 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C
@@ -1,6 +1,3 @@
-/** @file drawAllHisto.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
 // ind = [0;15] - index of the canvas to plot
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C
index f948591de1..a4e4de37c3 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C
@@ -1,6 +1,3 @@
-/** @file drawAllHisto2.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
 // ind = [0;15] - index of the canvas to plot
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C
index c97614ae01..a252cc786b 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C
@@ -1,6 +1,3 @@
-/** @file drawAllHisto3.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
 // ind = [0;15] - index of the canvas to plot
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/dumpHLD.cpp b/macro/rich/prototype/beamtime/NewUnpacker/dumpHLD.cpp
index b1b5eaa13e..468b7ac331 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/dumpHLD.cpp
+++ b/macro/rich/prototype/beamtime/NewUnpacker/dumpHLD.cpp
@@ -1,7 +1,5 @@
-/** @file dumpHLD.cpp
-  * @copyright Copyright (C) - CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
+
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/printMean.C b/macro/rich/prototype/beamtime/NewUnpacker/printMean.C
index 79889f2911..716f170b80 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/printMean.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/printMean.C
@@ -1,8 +1,6 @@
-/** @file printMean.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
+
 void printMean(TString filename = "Wuppertal_analysis.histo.root", Int_t calib = 1)
 {
   TFile* f = new TFile(filename);
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C
index 0ab7ca9733..7543ce42bd 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C
@@ -1,6 +1,3 @@
-/** @file run_analysis2.C
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C
index 0e29374294..07c5a3814b 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C
@@ -1,6 +1,3 @@
-/** @file run_analysis3.C
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C
index 40cc66523b..26371bc95a 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_single.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
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 fd88eee5a5..8757ff09f8 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_thr_scan.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C
index 83751f98db..93540edf6d 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_wu.C
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
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 4153db0071..6647938cad 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_wu_2.C
-  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
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 607d542d84..bbf36799e6 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,6 +1,3 @@
-/** @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 **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
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 1a3bfa00c8..ea5d292581 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,5 @@
-/** @file drawSpectra.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define NUMOFLINES 46
+
 void drawSpectra(const char* filename)
 {
   // Read the table from the file
diff --git a/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C b/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C
index abe5fea3f1..15b9eb599d 100644
--- a/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C
+++ b/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C
@@ -1,6 +1,3 @@
-/** @file FilterMultiPeak.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define THRESHOLD 45.  // Check the (un)commented code at the end of the macro
 #define KOEF 5         // Rebinning koef
 #define WINMIN 1.5     // ns
diff --git a/macro/rich/prototype/beamtime/Nov2015/FitExpo.C b/macro/rich/prototype/beamtime/Nov2015/FitExpo.C
index ccbf06a2a2..b95ea5b536 100644
--- a/macro/rich/prototype/beamtime/Nov2015/FitExpo.C
+++ b/macro/rich/prototype/beamtime/Nov2015/FitExpo.C
@@ -1,6 +1,3 @@
-/** @file FitExpo.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void FitExpo(TString filename = "sum_WLS_on_G1.root", TString histoName = "ExponentaBudetTut")
 {
   TFile* f1 = new TFile(filename);
diff --git a/macro/rich/prototype/beamtime/Nov2015/buildDeltaTable.C b/macro/rich/prototype/beamtime/Nov2015/buildDeltaTable.C
index aea22bcd71..d825a88372 100644
--- a/macro/rich/prototype/beamtime/Nov2015/buildDeltaTable.C
+++ b/macro/rich/prototype/beamtime/Nov2015/buildDeltaTable.C
@@ -1,7 +1,5 @@
-/** @file buildDeltaTable.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define MATRIXSIZE 128  // or 256 if you consider 4*4 PMTs
+
 // Transform pair tdcId/ch into some unique ID [from 0 to 255]
 // Size of the matrix is fixed to 16*16
 UInt_t tdcAndChToID(UInt_t tdcId, UInt_t ch)
diff --git a/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C b/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C
index 79ad3c1051..73c33a77bc 100644
--- a/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C
+++ b/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C
@@ -1,6 +1,3 @@
-/** @file draw_hitsPerEvent.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_hitsPerEvent(TString filename                = "output_fine_2/output_file_list.txt",
                        TString picturesFolder          = "pictures_fine_2",
                        TString analysisResultsFilename = "output_fine_2/analysisResults.root")
diff --git a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C
index 863983448f..4ea7755ac9 100644
--- a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C
+++ b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C
@@ -1,6 +1,3 @@
-/** @file draw_two_exps.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 b7a00a58b7..af39024215 100644
--- a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C
+++ b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C
@@ -1,6 +1,3 @@
-/** @file draw_two_exps_same.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 4e29f150a3..752b6b3a64 100644
--- a/macro/rich/prototype/beamtime/Nov2015/integrate.C
+++ b/macro/rich/prototype/beamtime/Nov2015/integrate.C
@@ -1,8 +1,6 @@
-/** @file integrate.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void integrate(TString filename1, TString filename2, TString histoName1, TString histoName2)
 {
+
   TFile* f1 = new TFile(filename1);
   TFile* f2 = new TFile(filename2);
 
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C
index 5315d6ff6b..000de71c87 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_laser.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C
index 8db9324758..89700330c2 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_laser2.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C
index afb0b2ea40..8f9d88a2a8 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_rings.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C
index 3cb898a9ca..37323b968b 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C
@@ -1,6 +1,3 @@
-/** @file run_analysis_rings2.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
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 b3656eaf04..9116ef38fa 100644
--- a/macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C
+++ b/macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C
@@ -1,6 +1,3 @@
-/** @file draw_two_exps.C
-  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 474a0ec41e..a93997b1d8 100644
--- a/macro/rich/prototype/beamtime/draw_analysis.C
+++ b/macro/rich/prototype/beamtime/draw_analysis.C
@@ -1,6 +1,4 @@
-/** @file draw_analysis.C
-  * @copyright Copyright (C) 2014-2016 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void draw_analysis()
 {
   TStopwatch timer;
diff --git a/macro/rich/prototype/beamtime/draw_study_report.C b/macro/rich/prototype/beamtime/draw_study_report.C
index 408c361425..10cc88e226 100644
--- a/macro/rich/prototype/beamtime/draw_study_report.C
+++ b/macro/rich/prototype/beamtime/draw_study_report.C
@@ -1,6 +1,4 @@
-/** @file draw_study_report.C
-  * @copyright Copyright (C) 2014-2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void draw_study_report()
 {
   gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
diff --git a/macro/rich/prototype/beamtime/run_analysis.C b/macro/rich/prototype/beamtime/run_analysis.C
index c76ad39d59..3af242ebc5 100644
--- a/macro/rich/prototype/beamtime/run_analysis.C
+++ b/macro/rich/prototype/beamtime/run_analysis.C
@@ -1,6 +1,3 @@
-/** @file run_analysis.C
-  * @copyright Copyright (C) 2014-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/beamtime/run_analysis2.C b/macro/rich/prototype/beamtime/run_analysis2.C
index c68355ef8a..d6df75f1bd 100644
--- a/macro/rich/prototype/beamtime/run_analysis2.C
+++ b/macro/rich/prototype/beamtime/run_analysis2.C
@@ -1,6 +1,3 @@
-/** @file run_analysis2.C
-  * @copyright Copyright (C) 2014-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 enum enu_calibMode
 {
   etn_IMPORT,  // import calibration tables from the file and use them
diff --git a/macro/rich/prototype/draw.C b/macro/rich/prototype/draw.C
index 7f894ceea6..a38b93b04f 100644
--- a/macro/rich/prototype/draw.C
+++ b/macro/rich/prototype/draw.C
@@ -1,7 +1,6 @@
-/** @file draw.C
-  * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "/misc/kresan/tools/drawStyle.C"
+
+
 void draw_points(Int_t nev = 1)
 {
   TPstyle();
diff --git a/macro/rich/prototype/efficiency.C b/macro/rich/prototype/efficiency.C
index 2a7a1d1bc8..47a5842928 100644
--- a/macro/rich/prototype/efficiency.C
+++ b/macro/rich/prototype/efficiency.C
@@ -1,6 +1,5 @@
-/** @file efficiency.C
-  * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 {
   gROOT->LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C");
   basiclibs();
diff --git a/macro/rich/prototype/geometry.C b/macro/rich/prototype/geometry.C
index 61f5bf989a..ed0041526d 100644
--- a/macro/rich/prototype/geometry.C
+++ b/macro/rich/prototype/geometry.C
@@ -1,6 +1,5 @@
-/** @file geometry.C
-  * @copyright Copyright (C) 2011-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void geometry()
 {
   TFile* file = new TFile("geofile_full.newgeo4.root");
diff --git a/macro/rich/prototype/run_ascii_generator.C b/macro/rich/prototype/run_ascii_generator.C
index da6158b6c7..d5cf536579 100644
--- a/macro/rich/prototype/run_ascii_generator.C
+++ b/macro/rich/prototype/run_ascii_generator.C
@@ -1,7 +1,5 @@
-/** @file run_ascii_generator.C
-  * @copyright Copyright (C) 2013 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 using namespace std;
 
 void run_ascii_generator(Int_t nEvents = 100000)
diff --git a/macro/rich/prototype/run_reco.C b/macro/rich/prototype/run_reco.C
index 929abebae5..097c455bb3 100644
--- a/macro/rich/prototype/run_reco.C
+++ b/macro/rich/prototype/run_reco.C
@@ -1,7 +1,5 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2011-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <string>
+
 using namespace std;
 
 void run_reco(Int_t nEvents = 100000)
diff --git a/macro/rich/prototype/run_sim.C b/macro/rich/prototype/run_sim.C
index 9f1739c442..abd065fe33 100644
--- a/macro/rich/prototype/run_sim.C
+++ b/macro/rich/prototype/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2011-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim(Int_t nEvents = 100000)
 {
   TString script = TString(gSystem->Getenv("SCRIPT"));
diff --git a/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C
index b7408eadb3..2268328dcc 100644
--- a/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C
@@ -1,9 +1,7 @@
-/** @file create_geo_cosy17.C
-  * @copyright Copyright (C) 2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 using namespace std;
 
+
 enum RichGeomType
 {
   kGlassLense,
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 9ff273ee29..95c4e5b3e3 100644
--- a/macro/rich/prototype/smallprototype/cosy17/draw_study_report_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/draw_study_report_cosy17.C
@@ -1,6 +1,3 @@
-/** @file draw_study_report_cosy17.C
-  * @copyright Copyright (C) 2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 2308c9654f..6a9e4ef804 100644
--- a/macro/rich/prototype/smallprototype/cosy17/run_ascii_generator_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/run_ascii_generator_cosy17.C
@@ -1,8 +1,6 @@
-/** @file run_ascii_generator_cosy17.C
-  * @copyright Copyright (C) 2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 #include <string>
+
 using namespace std;
 
 void run_ascii_generator_cosy17(Int_t nEvents = 100000)
diff --git a/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C
index d65a078519..2c2395b643 100644
--- a/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C
@@ -1,6 +1,3 @@
-/** @file run_reco_cosy17.C
-  * @copyright Copyright (C) 2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_reco_cosy17(Int_t nEvents = 500)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C
index 14496b54db..8ba398db3c 100644
--- a/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C
@@ -1,8 +1,6 @@
-/** @file run_sim_cosy17.C
-  * @copyright Copyright (C) 2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_sim_cosy17(Int_t nEvents = 500)
 {
+
   TTree::SetMaxTreeSize(90000000000);
 
   TString script = TString(gSystem->Getenv("SCRIPT"));
diff --git a/macro/rich/prototype/smallprototype/create_geo_smallprototype.C b/macro/rich/prototype/smallprototype/create_geo_smallprototype.C
index e2235bbc23..f5405c9afe 100644
--- a/macro/rich/prototype/smallprototype/create_geo_smallprototype.C
+++ b/macro/rich/prototype/smallprototype/create_geo_smallprototype.C
@@ -1,9 +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 **/
 #include <iostream>
 using namespace std;
 
+
 enum RichGeomType
 {
   kGlassLense,
diff --git a/macro/rich/prototype/smallprototype/draw_study_report.C b/macro/rich/prototype/smallprototype/draw_study_report.C
index b1a83fde73..cd12d64091 100644
--- a/macro/rich/prototype/smallprototype/draw_study_report.C
+++ b/macro/rich/prototype/smallprototype/draw_study_report.C
@@ -1,6 +1,3 @@
-/** @file draw_study_report.C
-  * @copyright Copyright (C) 2016-2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 using namespace std;
 void draw_study_report()
 {
diff --git a/macro/rich/prototype/smallprototype/run_ascii_generator.C b/macro/rich/prototype/smallprototype/run_ascii_generator.C
index ce356a1d54..23d6c00ee7 100644
--- a/macro/rich/prototype/smallprototype/run_ascii_generator.C
+++ b/macro/rich/prototype/smallprototype/run_ascii_generator.C
@@ -1,8 +1,6 @@
-/** @file run_ascii_generator.C
-  * @copyright Copyright (C) 2016-2017 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 #include <string>
+
 using namespace std;
 
 void run_ascii_generator(Int_t nEvents = 100000)
diff --git a/macro/rich/prototype/smallprototype/run_reco.C b/macro/rich/prototype/smallprototype/run_reco.C
index dddba04a24..bce8a35345 100644
--- a/macro/rich/prototype/smallprototype/run_reco.C
+++ b/macro/rich/prototype/smallprototype/run_reco.C
@@ -1,7 +1,5 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2016-2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 using namespace std;
+
 void run_reco(Int_t nEvents = 100000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/prototype/smallprototype/run_sim.C b/macro/rich/prototype/smallprototype/run_sim.C
index ce706273f5..16bb60b230 100644
--- a/macro/rich/prototype/smallprototype/run_sim.C
+++ b/macro/rich/prototype/smallprototype/run_sim.C
@@ -1,6 +1,3 @@
-/** @file run_sim.C
-  * @copyright Copyright (C) 2016-2017 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 static TString fieldMap;
 static Double_t fieldZ;
 static Double_t fieldScale;
diff --git a/macro/rich/prototype/spectrum.C b/macro/rich/prototype/spectrum.C
index 4658c2591d..05c9f3b80d 100644
--- a/macro/rich/prototype/spectrum.C
+++ b/macro/rich/prototype/spectrum.C
@@ -1,6 +1,6 @@
-/** @file spectrum.C
-  * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
+
 {
   const Float_t c = 2.998e8;
   const Float_t h = 6.626e-34;
diff --git a/macro/rich/run/draw_litqa.C b/macro/rich/run/draw_litqa.C
index 4a2f2b9174..3d1d2cfbb9 100644
--- a/macro/rich/run/draw_litqa.C
+++ b/macro/rich/run/draw_litqa.C
@@ -1,6 +1,3 @@
-/** @file draw_litqa.C
-  * @copyright Copyright (C) 2014-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_litqa()
 {
   //gROOT->LoadMacro("$VMCWORKDIR/macro/littrack/loadlibs.C");
diff --git a/macro/rich/run/run_digi.C b/macro/rich/run/run_digi.C
index 8e2a83df3e..d2be733b35 100644
--- a/macro/rich/run/run_digi.C
+++ b/macro/rich/run/run_digi.C
@@ -1,6 +1,3 @@
-/** @file run_digi.C
-  * @copyright Copyright (C) 2018-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
               const string& digiFile = "/Users/slebedev/Development/cbm/data/sim/rich/reco/raw.00000.root",
diff --git a/macro/rich/run/run_qa.C b/macro/rich/run/run_qa.C
index c44f59c6a8..bcb6bc211b 100644
--- a/macro/rich/run/run_qa.C
+++ b/macro/rich/run/run_qa.C
@@ -1,6 +1,3 @@
-/** @file run_qa.C
-  * @copyright Copyright (C) 2019-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
             const string& digiFile = "/Users/slebedev/Development/cbm/data/sim/rich/reco/digi.00000.root",
diff --git a/macro/rich/run/run_reco.C b/macro/rich/run/run_reco.C
index 674601d97b..582a5c07a8 100644
--- a/macro/rich/run/run_reco.C
+++ b/macro/rich/run/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2009-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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",
               const string& digiFile = "/Users/slebedev/Development/cbm/data/sim/rich/reco/raw.00000.root",
diff --git a/macro/rich/run/run_transport.C b/macro/rich/run/run_transport.C
index 2af1b1eeb8..a8102cf0eb 100644
--- a/macro/rich/run/run_transport.C
+++ b/macro/rich/run/run_transport.C
@@ -1,6 +1,3 @@
-/** @file run_transport.C
-  * @copyright Copyright (C) 2021 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void run_transport(const string& urqmdFile = "/Users/slebedev/Development/cbm/data/urqmd/auau/8gev/centr/"
                                              "urqmd.auau.8gev.centr.00001.root",  // if "", no urqmd
                    const string& traFile   = "/Users/slebedev/Development/cbm/data/sim/rich/reco/tra.00000.root",
diff --git a/macro/rich/timebased/run_rich_digi_tb.C b/macro/rich/timebased/run_rich_digi_tb.C
index 5c20730ed4..13f1e71739 100644
--- a/macro/rich/timebased/run_rich_digi_tb.C
+++ b/macro/rich/timebased/run_rich_digi_tb.C
@@ -1,6 +1,5 @@
-/** @file run_rich_digi_tb.C
-  * @copyright Copyright (C) 2017-2018 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 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 b6080b371f..075f5f54d9 100644
--- a/macro/rich/timebased/run_rich_reco_tb.C
+++ b/macro/rich/timebased/run_rich_reco_tb.C
@@ -1,6 +1,4 @@
-/** @file run_rich_reco_tb.C
-  * @copyright Copyright (C) 2017-2018 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void run_rich_reco_tb()
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/rich/timebased/run_rich_sim_tb.C b/macro/rich/timebased/run_rich_sim_tb.C
index 4af2c3d70b..bbddd79844 100644
--- a/macro/rich/timebased/run_rich_sim_tb.C
+++ b/macro/rich/timebased/run_rich_sim_tb.C
@@ -1,7 +1,5 @@
-/** @file run_rich_sim_tb.C
-  * @copyright Copyright (C) 2017-2018 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <stdio.h>
+
 void run_rich_sim_tb(Int_t nEvents = 1000)
 {
   TTree::SetMaxTreeSize(90000000000);
diff --git a/macro/run/checkFieldMap.C b/macro/run/checkFieldMap.C
index b1f969f1da..7e5df31cb3 100644
--- a/macro/run/checkFieldMap.C
+++ b/macro/run/checkFieldMap.C
@@ -1,6 +1,3 @@
-/** @file checkFieldMap.C
-  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for check of a magnetic field map
diff --git a/macro/run/checkFieldSym.C b/macro/run/checkFieldSym.C
index 38913c2a1e..5bd10c8c31 100644
--- a/macro/run/checkFieldSym.C
+++ b/macro/run/checkFieldSym.C
@@ -1,6 +1,3 @@
-/** @file checkFieldSym.C
-  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for check of the symmetries of a magnetic field map
diff --git a/macro/run/checkFields.C b/macro/run/checkFields.C
index 0f343f319f..8995f82618 100644
--- a/macro/run/checkFields.C
+++ b/macro/run/checkFields.C
@@ -1,6 +1,3 @@
-/** @file checkFields.C
-  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------------
 //
 // Macro to plot selected parts of magnetic field (map or B-splined) and auto save to pdf
diff --git a/macro/run/check_overlaps.C b/macro/run/check_overlaps.C
index bd67381d7c..72e83a480a 100644
--- a/macro/run/check_overlaps.C
+++ b/macro/run/check_overlaps.C
@@ -1,6 +1,3 @@
-/** @file check_overlaps.C
-  * @copyright Copyright (C) 2010-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void check_overlaps(const char* dataset = "test")
 {
   // 2014-07-04 - DE - test CBM setups for collisions in nightly tests
diff --git a/macro/run/draw.C b/macro/run/draw.C
index ec942a449e..3adf7fd044 100644
--- a/macro/run/draw.C
+++ b/macro/run/draw.C
@@ -1,6 +1,3 @@
-/** @file draw.C
-  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   TFile* f = new TFile("data/test.mc.root");
   TTree* t = f->Get("cbmsim");
diff --git a/macro/run/eventDisplay.C b/macro/run/eventDisplay.C
index ceec8bb22d..e38c0b44be 100644
--- a/macro/run/eventDisplay.C
+++ b/macro/run/eventDisplay.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2008-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void eventDisplay(TString dataset = "test")
 {
   TString inFile  = dataset + ".tra.root";
diff --git a/macro/run/run_qa.C b/macro/run/run_qa.C
index 084e7bf8de..267e2caf8a 100644
--- a/macro/run/run_qa.C
+++ b/macro/run/run_qa.C
@@ -1,6 +1,3 @@
-/** @file run_qa.C
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for simulation & reconstruction QA
diff --git a/macro/run/run_qa_old.C b/macro/run/run_qa_old.C
index a6ba690e37..632232ac56 100644
--- a/macro/run/run_qa_old.C
+++ b/macro/run/run_qa_old.C
@@ -1,6 +1,3 @@
-/** @file run_qa_old.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for STS QA
diff --git a/macro/run/run_reco_event.C b/macro/run/run_reco_event.C
index 3264168963..1d9629a782 100644
--- a/macro/run/run_reco_event.C
+++ b/macro/run/run_reco_event.C
@@ -1,6 +1,3 @@
-/** @file run_reco_event.C
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #// --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated raw data
diff --git a/macro/run/run_recoqa_tb_track.C b/macro/run/run_recoqa_tb_track.C
index de69bd00d7..b4442a9fd7 100644
--- a/macro/run/run_recoqa_tb_track.C
+++ b/macro/run/run_recoqa_tb_track.C
@@ -1,6 +1,3 @@
-/** @file run_recoqa_tb_track.C
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated time slices
diff --git a/macro/run/run_transport_qa.C b/macro/run/run_transport_qa.C
index 42e7385fb6..62d14396de 100644
--- a/macro/run/run_transport_qa.C
+++ b/macro/run/run_transport_qa.C
@@ -1,6 +1,3 @@
-/** @file run_transport_qa.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Test macro which compares the mean number of MC points for the various
 // detectors with benchmark values which were calculated using 100 central
 // UrQMD events. If the number of events is smaller than 10 the maximum deviation
diff --git a/macro/simcheck/checkSimField.C b/macro/simcheck/checkSimField.C
index a904a29bf9..68b3b0e59a 100644
--- a/macro/simcheck/checkSimField.C
+++ b/macro/simcheck/checkSimField.C
@@ -1,6 +1,3 @@
-/** @file checkSimField.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for check of the magnetic field used in simulation
diff --git a/macro/sts/Occupancy.C b/macro/sts/Occupancy.C
index 346af8a743..43567c11ef 100644
--- a/macro/sts/Occupancy.C
+++ b/macro/sts/Occupancy.C
@@ -1,6 +1,3 @@
-/** @file Occupancy.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // example.C
 #include <TCanvas.h>
 #include <TF1.h>
diff --git a/macro/sts/draw_qa_reco.C b/macro/sts/draw_qa_reco.C
index f843cef21a..f1d9b1a54d 100644
--- a/macro/sts/draw_qa_reco.C
+++ b/macro/sts/draw_qa_reco.C
@@ -1,6 +1,3 @@
-/** @file draw_qa_reco.C
-  * @copyright Copyright (C) 2007 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_qa_reco(TString inFileName = "reco.qa.root")
 {
   gStyle->SetPalette(1);
diff --git a/macro/sts/draw_qa_sim.C b/macro/sts/draw_qa_sim.C
index 50691b5a70..2397162ecd 100644
--- a/macro/sts/draw_qa_sim.C
+++ b/macro/sts/draw_qa_sim.C
@@ -1,6 +1,3 @@
-/** @file draw_qa_sim.C
-  * @copyright Copyright (C) 2007 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void draw_qa_sim(TString inFileName = "sim.qa.root")
 {
   gStyle->SetPalette(1);
diff --git a/macro/sts/geometry/create_STS_geo_file.C b/macro/sts/geometry/create_STS_geo_file.C
index b152fb2ef8..35eea69e57 100644
--- a/macro/sts/geometry/create_STS_geo_file.C
+++ b/macro/sts/geometry/create_STS_geo_file.C
@@ -1,8 +1,6 @@
-/** @file create_STS_geo_file.C
-  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void create_STS_geo_file(char* geometry = "sts-3maps-4strips")
 {
+
   // macro to create STS geometry description files for CBMROOT
   // from a data table
 
diff --git a/macro/sts/geometry/create_positionlist_plus4.C b/macro/sts/geometry/create_positionlist_plus4.C
index b1ff1a9357..8e65708d12 100644
--- a/macro/sts/geometry/create_positionlist_plus4.C
+++ b/macro/sts/geometry/create_positionlist_plus4.C
@@ -1,8 +1,6 @@
-/** @file create_positionlist_plus4.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //forward declaration
 void loop_over_nodes(TObjArray*, TString&, std::map<TString, TVector3>&);
+
 void create_positionlist_plus4(TString inFileName = "")
 {
 
diff --git a/macro/sts/matbudget_ana.C b/macro/sts/matbudget_ana.C
index cffb50645f..ea4dd7b2d2 100644
--- a/macro/sts/matbudget_ana.C
+++ b/macro/sts/matbudget_ana.C
@@ -1,8 +1,6 @@
-/** @file matbudget_ana.C
-  * @copyright Copyright (C) 2015-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
+
 #include "TCanvas.h"
 #include "TClonesArray.h"
 #include "TFile.h"
diff --git a/macro/sts/matbudget_ana_phi.C b/macro/sts/matbudget_ana_phi.C
index 3f05748710..b7bce2f6ff 100644
--- a/macro/sts/matbudget_ana_phi.C
+++ b/macro/sts/matbudget_ana_phi.C
@@ -1,8 +1,6 @@
-/** @file matbudget_ana_phi.C
-  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
+
 #include "TCanvas.h"
 #include "TClonesArray.h"
 #include "TFile.h"
diff --git a/macro/sts/matbudget_mc.C b/macro/sts/matbudget_mc.C
index d84b4b0e3a..011a4c7d46 100644
--- a/macro/sts/matbudget_mc.C
+++ b/macro/sts/matbudget_mc.C
@@ -1,6 +1,3 @@
-/** @file matbudget_mc.C
-  * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation with the STS
diff --git a/macro/sts/matbudget_mc_phi.C b/macro/sts/matbudget_mc_phi.C
index 78352ae393..c42d350520 100644
--- a/macro/sts/matbudget_mc_phi.C
+++ b/macro/sts/matbudget_mc_phi.C
@@ -1,6 +1,3 @@
-/** @file matbudget_mc_phi.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation with the STS
diff --git a/macro/sts/qa_reco.C b/macro/sts/qa_reco.C
index 51bfb3bfdf..1baa213ac3 100644
--- a/macro/sts/qa_reco.C
+++ b/macro/sts/qa_reco.C
@@ -1,6 +1,3 @@
-/** @file qa_reco.C
-  * @copyright Copyright (C) 2007-2009 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for STS Reconstruction QA
diff --git a/macro/sts/qa_sim.C b/macro/sts/qa_sim.C
index 03fb8198a3..34422a3218 100644
--- a/macro/sts/qa_sim.C
+++ b/macro/sts/qa_sim.C
@@ -1,6 +1,3 @@
-/** @file qa_sim.C
-  * @copyright Copyright (C) 2007-2009 CBM Collaboration, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for STS Simulation QA
diff --git a/macro/sts/sts_Qa.C b/macro/sts/sts_Qa.C
index f608d55c02..a8431bd95a 100644
--- a/macro/sts/sts_Qa.C
+++ b/macro/sts/sts_Qa.C
@@ -1,6 +1,3 @@
-/** @file sts_Qa.C
-  * @copyright Copyright (C) 2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for quality check in STS
diff --git a/macro/sts/sts_digi.C b/macro/sts/sts_digi.C
index 00c277287c..b9c506d4b6 100644
--- a/macro/sts/sts_digi.C
+++ b/macro/sts/sts_digi.C
@@ -1,6 +1,3 @@
-/** @file sts_digi.C
-  * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for digitization in STS from MC data
diff --git a/macro/sts/sts_reco.C b/macro/sts/sts_reco.C
index 32ff8820eb..4f9596eabd 100644
--- a/macro/sts/sts_reco.C
+++ b/macro/sts/sts_reco.C
@@ -1,6 +1,3 @@
-/** @file sts_reco.C
-  * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction in STS from digi data
diff --git a/macro/sts/sts_reco_all.C b/macro/sts/sts_reco_all.C
index 1ed31d6c21..332f020255 100644
--- a/macro/sts/sts_reco_all.C
+++ b/macro/sts/sts_reco_all.C
@@ -1,6 +1,3 @@
-/** @file sts_reco_all.C
-  * @copyright Copyright (C) 2010-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction in STS from MC data
diff --git a/macro/sts/sts_reco_ideal.C b/macro/sts/sts_reco_ideal.C
index 9a8c758e1d..2b1d018ea3 100644
--- a/macro/sts/sts_reco_ideal.C
+++ b/macro/sts/sts_reco_ideal.C
@@ -1,6 +1,3 @@
-/** @file sts_reco_ideal.C
-  * @copyright Copyright (C) 2009-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction in STS from MC data
diff --git a/macro/sts/sts_reco_raw.C b/macro/sts/sts_reco_raw.C
index 4de14b368a..86441ee6f4 100644
--- a/macro/sts/sts_reco_raw.C
+++ b/macro/sts/sts_reco_raw.C
@@ -1,6 +1,3 @@
-/** @file sts_reco_raw.C
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for local reconstruction in STS from RAW data
diff --git a/macro/sts/sts_sim.C b/macro/sts/sts_sim.C
index b2654e0f4e..a2a9e0fc86 100644
--- a/macro/sts/sts_sim.C
+++ b/macro/sts/sts_sim.C
@@ -1,6 +1,3 @@
-/** @file sts_sim.C
-  * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/sts/sts_sim_auau.C b/macro/sts/sts_sim_auau.C
index b4442797a1..62afbee643 100644
--- a/macro/sts/sts_sim_auau.C
+++ b/macro/sts/sts_sim_auau.C
@@ -1,6 +1,3 @@
-/** @file sts_sim_auau.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/sts/sts_sim_pau.C b/macro/sts/sts_sim_pau.C
index 6376a318b8..718b56531e 100644
--- a/macro/sts/sts_sim_pau.C
+++ b/macro/sts/sts_sim_pau.C
@@ -1,6 +1,3 @@
-/** @file sts_sim_pau.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/sts/sts_sim_single.C b/macro/sts/sts_sim_single.C
index 8257230684..9d7d80a2e6 100644
--- a/macro/sts/sts_sim_single.C
+++ b/macro/sts/sts_sim_single.C
@@ -1,6 +1,3 @@
-/** @file sts_sim_single.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for STS-only simulation, digitisation and reconstruction
diff --git a/macro/sts/sts_transport.C b/macro/sts/sts_transport.C
index de04a31170..81d548b6bb 100644
--- a/macro/sts/sts_transport.C
+++ b/macro/sts/sts_transport.C
@@ -1,6 +1,3 @@
-/** @file sts_transport.C
-  * @copyright Copyright (C) 2010-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for STS-only transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/CbmTofHitsProd.C b/macro/tof/CbmTofHitsProd.C
index 693a0b46ef..d6240aadb3 100644
--- a/macro/tof/CbmTofHitsProd.C
+++ b/macro/tof/CbmTofHitsProd.C
@@ -1,7 +1,5 @@
-/** @file CbmTofHitsProd.C
-  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro to produce Tof Hit from transported file
+
 {
   TStopwatch timer;
   timer.Start();
diff --git a/macro/tof/TOF_test.C b/macro/tof/TOF_test.C
index 51e4c8913b..6dfa83e0c5 100644
--- a/macro/tof/TOF_test.C
+++ b/macro/tof/TOF_test.C
@@ -1,6 +1,3 @@
-/** @file TOF_test.C
-  * @copyright Copyright (C) 2012 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //Generator for CbmTof Geometry
 //Update 01/10/2012 nh
 // 08/10/2012 add sensitive gas gaps
diff --git a/macro/tof/Tof_QA.C b/macro/tof/Tof_QA.C
index 089009a44d..af808664d7 100644
--- a/macro/tof/Tof_QA.C
+++ b/macro/tof/Tof_QA.C
@@ -1,6 +1,3 @@
-/** @file Tof_QA.C
-  * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmGlobalTrack.h"
 #include "CbmMCTrack.h"
 #include "CbmStsTrack.h"
diff --git a/macro/tof/anaTof100.C b/macro/tof/anaTof100.C
index 45b2d9e995..04f61a806b 100644
--- a/macro/tof/anaTof100.C
+++ b/macro/tof/anaTof100.C
@@ -1,8 +1,6 @@
-/** @file anaTof100.C
-  * @copyright Copyright (C) 2012 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 anaTof100()
 {
+
   TString InputFile = "data/auaumbias.root";
   TString ParFile   = "data/testparams.root";
 
diff --git a/macro/tof/beamtime/apr14/ana_digi.C b/macro/tof/beamtime/apr14/ana_digi.C
index 45b100c804..bb9d79210e 100644
--- a/macro/tof/beamtime/apr14/ana_digi.C
+++ b/macro/tof/beamtime/apr14/ana_digi.C
@@ -1,6 +1,3 @@
-/** @file ana_digi.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 64c97e5792..e42a4233b3 100644
--- a/macro/tof/beamtime/apr14/ana_digi_Sun2325.C
+++ b/macro/tof/beamtime/apr14/ana_digi_Sun2325.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_Sun2325.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 62ce312a4b..c68cdad489 100644
--- a/macro/tof/beamtime/apr14/ana_lmd.C
+++ b/macro/tof/beamtime/apr14/ana_lmd.C
@@ -1,6 +1,3 @@
-/** @file ana_lmd.C
-  * @copyright Copyright (C) 2015-2016 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for analyzing test setup data
diff --git a/macro/tof/beamtime/apr14/currents/CurrRateHd.C b/macro/tof/beamtime/apr14/currents/CurrRateHd.C
index e9380a4997..5285ee4988 100644
--- a/macro/tof/beamtime/apr14/currents/CurrRateHd.C
+++ b/macro/tof/beamtime/apr14/currents/CurrRateHd.C
@@ -1,7 +1,5 @@
-/** @file CurrRateHd.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TString.h"
+
 #include "StructDef.h"
 
 Bool_t CurrRateHd(Int_t iDet = 0, Int_t iDetectorIndex = 0, Double_t dTimeOffset = 0.0, Double_t dScaleFactor = 1.0)
diff --git a/macro/tof/beamtime/apr14/currents/StructDef.h b/macro/tof/beamtime/apr14/currents/StructDef.h
index a0f0c3046b..2b72339d55 100644
--- a/macro/tof/beamtime/apr14/currents/StructDef.h
+++ b/macro/tof/beamtime/apr14/currents/StructDef.h
@@ -1,7 +1,6 @@
-/** @file StructDef.h
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "Riostream.h"
+
 typedef struct {
   Int_t iTimeSec;
   Int_t iTimeMilliSec;
diff --git a/macro/tof/beamtime/apr14/currents/currentPlot.C b/macro/tof/beamtime/apr14/currents/currentPlot.C
index 65237cd778..a432e53d08 100644
--- a/macro/tof/beamtime/apr14/currents/currentPlot.C
+++ b/macro/tof/beamtime/apr14/currents/currentPlot.C
@@ -1,7 +1,6 @@
-/** @file currentPlot.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TString.h"
+
 #include "StructDef.h"
 
 //200414 200414 200414 200414 200414
diff --git a/macro/tof/beamtime/apr14/currents/currentPlotHd.C b/macro/tof/beamtime/apr14/currents/currentPlotHd.C
index eb247932e2..0a63b520c3 100644
--- a/macro/tof/beamtime/apr14/currents/currentPlotHd.C
+++ b/macro/tof/beamtime/apr14/currents/currentPlotHd.C
@@ -1,7 +1,6 @@
-/** @file currentPlotHd.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TString.h"
+
 #include "StructDef.h"
 
 //200414 200414 200414 200414 200414
diff --git a/macro/tof/beamtime/apr14/currents/currentTreeConv.C b/macro/tof/beamtime/apr14/currents/currentTreeConv.C
index d333088efc..eaf4e39aee 100644
--- a/macro/tof/beamtime/apr14/currents/currentTreeConv.C
+++ b/macro/tof/beamtime/apr14/currents/currentTreeConv.C
@@ -1,7 +1,6 @@
-/** @file currentTreeConv.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TString.h"
+
 #include "StructDef.h"
 
 
diff --git a/macro/tof/beamtime/apr14/currents/hvScalUseExample.C b/macro/tof/beamtime/apr14/currents/hvScalUseExample.C
index cb4e81fa5b..17818b8ffc 100644
--- a/macro/tof/beamtime/apr14/currents/hvScalUseExample.C
+++ b/macro/tof/beamtime/apr14/currents/hvScalUseExample.C
@@ -1,7 +1,6 @@
-/** @file hvScalUseExample.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "StructDef.h"
+
 //#include "$SIMPATH/unpack/tof/calib/scaler/TTofCalibScaler.h"
 
 Bool_t hvScalUseExample(Int_t iFirstRPC = 0, Int_t iSecondRpc = 2, Int_t iScalerIndex = 3, Double_t dScalerArea = -1)
diff --git a/macro/tof/beamtime/apr14/currents/loopTreeConv.C b/macro/tof/beamtime/apr14/currents/loopTreeConv.C
index 76958a23b9..49b6433d2b 100644
--- a/macro/tof/beamtime/apr14/currents/loopTreeConv.C
+++ b/macro/tof/beamtime/apr14/currents/loopTreeConv.C
@@ -1,6 +1,5 @@
-/** @file loopTreeConv.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 Bool_t loopTreeConv(Int_t iSecOffset = 0, Int_t iMilliSecOffset = 0)
 {
   const Int_t kiNbFiles = 5 + 12 + 8 + 14 + 15 + 1;
diff --git a/macro/tof/beamtime/apr14/currents/mergeTrees.C b/macro/tof/beamtime/apr14/currents/mergeTrees.C
index 220dae422c..ae679e9f8d 100644
--- a/macro/tof/beamtime/apr14/currents/mergeTrees.C
+++ b/macro/tof/beamtime/apr14/currents/mergeTrees.C
@@ -1,7 +1,6 @@
-/** @file mergeTrees.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TString.h"
+
 Bool_t mergeTrees()
 {
 
diff --git a/macro/tof/beamtime/apr14/currents/ratePlot.C b/macro/tof/beamtime/apr14/currents/ratePlot.C
index bfbe40b83b..617c811298 100644
--- a/macro/tof/beamtime/apr14/currents/ratePlot.C
+++ b/macro/tof/beamtime/apr14/currents/ratePlot.C
@@ -1,6 +1,4 @@
-/** @file ratePlot.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t ratePlot()
 {
 
diff --git a/macro/tof/beamtime/apr14/currents/ratePlotExample.C b/macro/tof/beamtime/apr14/currents/ratePlotExample.C
index 0a4efc00c2..52e92e9ff7 100644
--- a/macro/tof/beamtime/apr14/currents/ratePlotExample.C
+++ b/macro/tof/beamtime/apr14/currents/ratePlotExample.C
@@ -1,6 +1,4 @@
-/** @file ratePlotExample.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t ratePlotExample(Int_t iScalerIndex = 3, Double_t dScalerArea = -1)
 {
   if (-1 == dScalerArea && 3 == iScalerIndex) dScalerArea = 40;  //cm^2, just a guess for HD PMT
diff --git a/macro/tof/beamtime/apr14/currents/ratePlotHd.C b/macro/tof/beamtime/apr14/currents/ratePlotHd.C
index 0119b1cb49..a52fb90a79 100644
--- a/macro/tof/beamtime/apr14/currents/ratePlotHd.C
+++ b/macro/tof/beamtime/apr14/currents/ratePlotHd.C
@@ -1,6 +1,4 @@
-/** @file ratePlotHd.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 Bool_t ratePlotHd()
 {
 
diff --git a/macro/tof/beamtime/apr14/pl_all_DigiCor.C b/macro/tof/beamtime/apr14/pl_all_DigiCor.C
index b2c36550e1..3d123bfbee 100644
--- a/macro/tof/beamtime/apr14/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/apr14/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc(Int_t iNDet = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C b/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C
index 4e0e1ab2d1..24f3d9dc98 100644
--- a/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C
+++ b/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluDelTofTrg.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluDelTofTrg(Int_t iNch = 1, Int_t iTrg = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C b/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C
index 68347de13d..eff45541d3 100644
--- a/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C
+++ b/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalkTrg.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalkTrg(Int_t iNch = 1, Int_t i1 = 0, Int_t iTrg = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C b/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C
index cdd4d83234..f52ddb5576 100644
--- a/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trb_evtsize.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_all_trbtdc.C b/macro/tof/beamtime/apr14/pl_all_trbtdc.C
index f7352defd4..fe5cf786e7 100644
--- a/macro/tof/beamtime/apr14/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/apr14/pl_all_trbtdc.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
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 e62270c88c..d232607aac 100644
--- a/macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_proc_status.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C b/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C
index bae08aa775..aeca9a8058 100644
--- a/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_words.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_deb_pla.C b/macro/tof/beamtime/apr14/pl_deb_pla.C
index e4591709d5..3502d5d7f7 100644
--- a/macro/tof/beamtime/apr14/pl_deb_pla.C
+++ b/macro/tof/beamtime/apr14/pl_deb_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_deb_pla.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_moni_clu.C b/macro/tof/beamtime/apr14/pl_moni_clu.C
index b77988b4f6..1349f2be3c 100644
--- a/macro/tof/beamtime/apr14/pl_moni_clu.C
+++ b/macro/tof/beamtime/apr14/pl_moni_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_moni_clu.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_Mat04best.C b/macro/tof/beamtime/apr14/pl_over_Mat04best.C
index 295949782d..9a39056e1f 100644
--- a/macro/tof/beamtime/apr14/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/apr14/pl_over_Mat04best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04best.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_Mat24.C b/macro/tof/beamtime/apr14/pl_over_Mat24.C
index 67a15a9f8b..200aa76c53 100644
--- a/macro/tof/beamtime/apr14/pl_over_Mat24.C
+++ b/macro/tof/beamtime/apr14/pl_over_Mat24.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat24.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_cl2g.C b/macro/tof/beamtime/apr14/pl_over_cl2g.C
index cea14cb79d..54153d3d6d 100644
--- a/macro/tof/beamtime/apr14/pl_over_cl2g.C
+++ b/macro/tof/beamtime/apr14/pl_over_cl2g.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cl2g.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu.C b/macro/tof/beamtime/apr14/pl_over_clu.C
index ad19cc4768..4f6a629436 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_clu(Int_t SmT = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu0.C b/macro/tof/beamtime/apr14/pl_over_clu0.C
index 2625ce05c3..f595acb4c1 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu0.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu0T0.C b/macro/tof/beamtime/apr14/pl_over_clu0T0.C
index 9b0d216954..c480e0702f 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu0T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0T0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu1.C b/macro/tof/beamtime/apr14/pl_over_clu1.C
index 50f3b550ac..0d30825ece 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu1.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu1.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu1.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu2.C b/macro/tof/beamtime/apr14/pl_over_clu2.C
index 664695a488..7e6ae43443 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu2.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu2.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu2T.C b/macro/tof/beamtime/apr14/pl_over_clu2T.C
index f11f74a0ce..548655afe8 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu2T.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu2T.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu2trg0.C b/macro/tof/beamtime/apr14/pl_over_clu2trg0.C
index f54d642019..829d747e11 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu2trg0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2trg0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_clu4.C b/macro/tof/beamtime/apr14/pl_over_clu4.C
index 03256cb5ee..5f964e9f73 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu4.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu4.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu4.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_cluTrg.C b/macro/tof/beamtime/apr14/pl_over_cluTrg.C
index 303a2f8f84..748eb097db 100644
--- a/macro/tof/beamtime/apr14/pl_over_cluTrg.C
+++ b/macro/tof/beamtime/apr14/pl_over_cluTrg.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cluTrg.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cluTrg(Int_t iTrg = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clust.C b/macro/tof/beamtime/apr14/pl_over_clust.C
index 6b3779083c..179ce00364 100644
--- a/macro/tof/beamtime/apr14/pl_over_clust.C
+++ b/macro/tof/beamtime/apr14/pl_over_clust.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clust.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_pla.C b/macro/tof/beamtime/apr14/pl_over_pla.C
index 2b3f7eacbc..bd8c402dd4 100644
--- a/macro/tof/beamtime/apr14/pl_over_pla.C
+++ b/macro/tof/beamtime/apr14/pl_over_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_over_pla.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/apr14/pl_over_trb_ct.C b/macro/tof/beamtime/apr14/pl_over_trb_ct.C
index f1f141385f..5cf941221e 100644
--- a/macro/tof/beamtime/apr14/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/apr14/pl_over_trb_ct.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ct.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_trb_ft.C b/macro/tof/beamtime/apr14/pl_over_trb_ft.C
index 7936482ad0..c9180330ba 100644
--- a/macro/tof/beamtime/apr14/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/apr14/pl_over_trb_ft.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ft.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_vftx.C b/macro/tof/beamtime/apr14/pl_over_vftx.C
index c14828bd45..3a318b8546 100644
--- a/macro/tof/beamtime/apr14/pl_over_vftx.C
+++ b/macro/tof/beamtime/apr14/pl_over_vftx.C
@@ -1,6 +1,3 @@
-/** @file pl_over_vftx.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/ana_digi.C b/macro/tof/beamtime/feb15/ana_digi.C
index 5d65af6239..4da26a132f 100644
--- a/macro/tof/beamtime/feb15/ana_digi.C
+++ b/macro/tof/beamtime/feb15/ana_digi.C
@@ -1,6 +1,3 @@
-/** @file ana_digi.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 515bf62e21..3b76a20e03 100644
--- a/macro/tof/beamtime/feb15/ana_digi_cal.C
+++ b/macro/tof/beamtime/feb15/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 3acf40b813..59959f218e 100644
--- a/macro/tof/beamtime/feb15/ana_digi_deb.C
+++ b/macro/tof/beamtime/feb15/ana_digi_deb.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_deb.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 c6a60cd709..96111e302c 100644
--- a/macro/tof/beamtime/feb15/ana_digi_ini.C
+++ b/macro/tof/beamtime/feb15/ana_digi_ini.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_ini.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 99d7ff4879..2e53d4724c 100644
--- a/macro/tof/beamtime/feb15/ana_digi_nodia.C
+++ b/macro/tof/beamtime/feb15/ana_digi_nodia.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_nodia.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 30a91be227..2b32de166f 100644
--- a/macro/tof/beamtime/feb15/ana_hits.C
+++ b/macro/tof/beamtime/feb15/ana_hits.C
@@ -1,6 +1,3 @@
-/** @file ana_hits.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/basic_unpacking.C b/macro/tof/beamtime/feb15/basic_unpacking.C
index f96f86e885..d61c0eb8ec 100644
--- a/macro/tof/beamtime/feb15/basic_unpacking.C
+++ b/macro/tof/beamtime/feb15/basic_unpacking.C
@@ -1,6 +1,3 @@
-/** @file basic_unpacking.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/current/FileListDef.h b/macro/tof/beamtime/feb15/current/FileListDef.h
index 7789f95d77..35050e5dec 100644
--- a/macro/tof/beamtime/feb15/current/FileListDef.h
+++ b/macro/tof/beamtime/feb15/current/FileListDef.h
@@ -1,8 +1,6 @@
-/** @file FileListDef.h
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Definitions for the HV monitoring in Feb. 2015 beamtime at CERN SPS
 // 22/04/2015, P.-A. Loizeau
+
 /************************ Files definitions *************************/
 // 2015-02-24 3
 // 240215 240215 240215
diff --git a/macro/tof/beamtime/feb15/current/StructDef.h b/macro/tof/beamtime/feb15/current/StructDef.h
index 4245f64aa8..b689d74609 100644
--- a/macro/tof/beamtime/feb15/current/StructDef.h
+++ b/macro/tof/beamtime/feb15/current/StructDef.h
@@ -1,7 +1,6 @@
-/** @file StructDef.h
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 //#include "Riostream.h"
+
 typedef struct Rpc_HV {
   Int_t iTimeSec;
   Int_t iTimeMilliSec;
diff --git a/macro/tof/beamtime/feb15/current/currentTreeConv.C b/macro/tof/beamtime/feb15/current/currentTreeConv.C
index 31d37cb26c..269d64d9df 100644
--- a/macro/tof/beamtime/feb15/current/currentTreeConv.C
+++ b/macro/tof/beamtime/feb15/current/currentTreeConv.C
@@ -1,6 +1,3 @@
-/** @file currentTreeConv.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ROOT headers
 #include "TFile.h"
 #include "TObjArray.h"
diff --git a/macro/tof/beamtime/feb15/current/loopTreeConv.C b/macro/tof/beamtime/feb15/current/loopTreeConv.C
index f40e018dc0..9afa530c54 100644
--- a/macro/tof/beamtime/feb15/current/loopTreeConv.C
+++ b/macro/tof/beamtime/feb15/current/loopTreeConv.C
@@ -1,7 +1,5 @@
-/** @file loopTreeConv.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "FileListDef.h"
+
 Bool_t loopTreeConv(Int_t iSecOffset = 0, Int_t iMilliSecOffset = 0)
 {
 
diff --git a/macro/tof/beamtime/feb15/current/mergeTrees.C b/macro/tof/beamtime/feb15/current/mergeTrees.C
index 92069b6f2c..3d378e5adc 100644
--- a/macro/tof/beamtime/feb15/current/mergeTrees.C
+++ b/macro/tof/beamtime/feb15/current/mergeTrees.C
@@ -1,7 +1,6 @@
-/** @file mergeTrees.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TString.h"
+
 #include "FileListDef.h"
 
 Bool_t mergeTrees()
diff --git a/macro/tof/beamtime/feb15/current/plot_Current_Date.C b/macro/tof/beamtime/feb15/current/plot_Current_Date.C
index f1a6242b19..d60f1f4d98 100644
--- a/macro/tof/beamtime/feb15/current/plot_Current_Date.C
+++ b/macro/tof/beamtime/feb15/current/plot_Current_Date.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 #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 acf62c6e83..f48da62d3a 100644
--- a/macro/tof/beamtime/feb15/dis_hits.C
+++ b/macro/tof/beamtime/feb15/dis_hits.C
@@ -1,6 +1,3 @@
-/** @file dis_hits.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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)
 {  // display hits in event display
diff --git a/macro/tof/beamtime/feb15/merge_rate.C b/macro/tof/beamtime/feb15/merge_rate.C
index c2d9febf75..3eabe5a836 100644
--- a/macro/tof/beamtime/feb15/merge_rate.C
+++ b/macro/tof/beamtime/feb15/merge_rate.C
@@ -1,6 +1,5 @@
-/** @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 **/
+
+
 void merge_rate()
 {
   TChain* inputChain = new TChain("cbmsim");
diff --git a/macro/tof/beamtime/feb15/pl_XY_trk.C b/macro/tof/beamtime/feb15/pl_XY_trk.C
index 0887ef40bd..2bf2533beb 100644
--- a/macro/tof/beamtime/feb15/pl_XY_trk.C
+++ b/macro/tof/beamtime/feb15/pl_XY_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_XY_trk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_XY_trk(Int_t NSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_CluMul.C b/macro/tof/beamtime/feb15/pl_all_CluMul.C
index 4a36d48df5..f2fd4aa61a 100644
--- a/macro/tof/beamtime/feb15/pl_all_CluMul.C
+++ b/macro/tof/beamtime/feb15/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNDet = 8)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_DigiCor.C b/macro/tof/beamtime/feb15/pl_all_DigiCor.C
index 5262b25ce8..5c088c09ec 100644
--- a/macro/tof/beamtime/feb15/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/feb15/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 9)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_XY.C b/macro/tof/beamtime/feb15/pl_all_XY.C
index 8bcb037a98..a85765113b 100644
--- a/macro/tof/beamtime/feb15/pl_all_XY.C
+++ b/macro/tof/beamtime/feb15/pl_all_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_all_XY.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_XY(Int_t iNDet = 10)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C b/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C
index 5b010cd01c..6efa4cded5 100644
--- a/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C
+++ b/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluDelTofSel.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluDelTofSel(Int_t iNch = 1, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_cluWalk.C b/macro/tof/beamtime/feb15/pl_all_cluWalk.C
index 719e0b7c23..df137f91d9 100644
--- a/macro/tof/beamtime/feb15/pl_all_cluWalk.C
+++ b/macro/tof/beamtime/feb15/pl_all_cluWalk.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C b/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C
index 23caac0f98..ae3a76edfa 100644
--- a/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C
+++ b/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalkSel.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_time_resolution.C b/macro/tof/beamtime/feb15/pl_all_time_resolution.C
index bbd9257612..a13fa3eb55 100644
--- a/macro/tof/beamtime/feb15/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/feb15/pl_all_time_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_all_time_resolution.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_time_resolution(UInt_t uTdcNumber1, UInt_t uTdcNumber2)
 {
   Int_t const kTdcChNb = 16;
diff --git a/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C b/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C
index 2f69de5ce3..f52ddb5576 100644
--- a/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trb_evtsize.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc.C b/macro/tof/beamtime/feb15/pl_all_trbtdc.C
index 9c87259214..2849872cd1 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
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 805550c92d..d232607aac 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_proc_status.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C b/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C
index cd64d6dfab..0826c49761 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_refs.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C b/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C
index bda31b8782..aeca9a8058 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_words.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_calib_trk.C b/macro/tof/beamtime/feb15/pl_calib_trk.C
index 41d7af57f8..905c6b3a2b 100644
--- a/macro/tof/beamtime/feb15/pl_calib_trk.C
+++ b/macro/tof/beamtime/feb15/pl_calib_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_calib_trk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_calib_trk()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_deb_pla.C b/macro/tof/beamtime/feb15/pl_deb_pla.C
index 25e5e68f4e..3502d5d7f7 100644
--- a/macro/tof/beamtime/feb15/pl_deb_pla.C
+++ b/macro/tof/beamtime/feb15/pl_deb_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_deb_pla.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_diam_tres.C b/macro/tof/beamtime/feb15/pl_diam_tres.C
index 9ebfbb570b..0f5a1bbdaa 100644
--- a/macro/tof/beamtime/feb15/pl_diam_tres.C
+++ b/macro/tof/beamtime/feb15/pl_diam_tres.C
@@ -1,6 +1,3 @@
-/** @file pl_diam_tres.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_diam_tres(UInt_t uTdcNumber1 = 32, UInt_t uTdcNumber2 = 33)
 {
   const Int_t kiNbCh = 16;
diff --git a/macro/tof/beamtime/feb15/pl_eff_XY.C b/macro/tof/beamtime/feb15/pl_eff_XY.C
index fb237097d2..2af0c5944e 100644
--- a/macro/tof/beamtime/feb15/pl_eff_XY.C
+++ b/macro/tof/beamtime/feb15/pl_eff_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_eff_XY.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_eff_XY(Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_info_2D.C b/macro/tof/beamtime/feb15/pl_info_2D.C
index 2badb3eeb4..4c41ee0e30 100644
--- a/macro/tof/beamtime/feb15/pl_info_2D.C
+++ b/macro/tof/beamtime/feb15/pl_info_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_info_2D.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_2D(char* cHist = "hDTD4DT04D4best", Int_t iDBin = 1, Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_info_Chi2D.C b/macro/tof/beamtime/feb15/pl_info_Chi2D.C
index 442b48d04f..f098507b25 100644
--- a/macro/tof/beamtime/feb15/pl_info_Chi2D.C
+++ b/macro/tof/beamtime/feb15/pl_info_Chi2D.C
@@ -1,6 +1,3 @@
-/** @file pl_info_Chi2D.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_Chi2D(char* cHist = "hChiDT04D4best", Int_t iDBin = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C b/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C
index ec4f27daae..0418ac2756 100644
--- a/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C
+++ b/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_info_Mat04D4best.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_info_cluTot.C b/macro/tof/beamtime/feb15/pl_info_cluTot.C
index 7d3ab09e41..3ab816732c 100644
--- a/macro/tof/beamtime/feb15/pl_info_cluTot.C
+++ b/macro/tof/beamtime/feb15/pl_info_cluTot.C
@@ -1,6 +1,3 @@
-/** @file pl_info_cluTot.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_cluTot(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_loc_XY.C b/macro/tof/beamtime/feb15/pl_loc_XY.C
index 6521ccc4f2..8405ab7134 100644
--- a/macro/tof/beamtime/feb15/pl_loc_XY.C
+++ b/macro/tof/beamtime/feb15/pl_loc_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_loc_XY.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_loc_XY(Int_t iNDet = 10)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_map_debug.C b/macro/tof/beamtime/feb15/pl_map_debug.C
index 985c740470..053e99bf14 100644
--- a/macro/tof/beamtime/feb15/pl_map_debug.C
+++ b/macro/tof/beamtime/feb15/pl_map_debug.C
@@ -1,6 +1,4 @@
-/** @file pl_map_debug.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_map_debug(Int_t iFirstTdc = 30, Int_t iSecondTdc = 30)
 {
   // constants
diff --git a/macro/tof/beamtime/feb15/pl_moni_clu.C b/macro/tof/beamtime/feb15/pl_moni_clu.C
index e01db53151..1349f2be3c 100644
--- a/macro/tof/beamtime/feb15/pl_moni_clu.C
+++ b/macro/tof/beamtime/feb15/pl_moni_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_moni_clu.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_2hit.C b/macro/tof/beamtime/feb15/pl_over_2hit.C
index 8e11d8e0f6..79d0bc0fd2 100644
--- a/macro/tof/beamtime/feb15/pl_over_2hit.C
+++ b/macro/tof/beamtime/feb15/pl_over_2hit.C
@@ -1,6 +1,3 @@
-/** @file pl_over_2hit.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_2hit(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04.C b/macro/tof/beamtime/feb15/pl_over_Mat04.C
index de34c50eb4..6416c2bc2c 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C b/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C
index a670cd76e3..ac5bdf67ed 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4best.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C b/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C
index 6d14260952..6e7d38db64 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4sbest.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4sbest(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04best.C b/macro/tof/beamtime/feb15/pl_over_Mat04best.C
index 64a7491ab9..3a2cc8a6ff 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04best.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat24.C b/macro/tof/beamtime/feb15/pl_over_Mat24.C
index b2d9f472ca..d4bf23cd52 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat24.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat24.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat24.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_MatD4sel.C b/macro/tof/beamtime/feb15/pl_over_MatD4sel.C
index 0c710aa400..f3f5a2bf1a 100644
--- a/macro/tof/beamtime/feb15/pl_over_MatD4sel.C
+++ b/macro/tof/beamtime/feb15/pl_over_MatD4sel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_MatD4sel.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_MatD4sel()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_XX.C b/macro/tof/beamtime/feb15/pl_over_XX.C
index cfa620055f..4a851f2a81 100644
--- a/macro/tof/beamtime/feb15/pl_over_XX.C
+++ b/macro/tof/beamtime/feb15/pl_over_XX.C
@@ -1,6 +1,3 @@
-/** @file pl_over_XX.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_cl2g.C b/macro/tof/beamtime/feb15/pl_over_cl2g.C
index bfbd11d7c1..54153d3d6d 100644
--- a/macro/tof/beamtime/feb15/pl_over_cl2g.C
+++ b/macro/tof/beamtime/feb15/pl_over_cl2g.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cl2g.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu.C b/macro/tof/beamtime/feb15/pl_over_clu.C
index b85c6d4c18..a49bb227ac 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu0.C b/macro/tof/beamtime/feb15/pl_over_clu0.C
index 8b7bc0d434..f595acb4c1 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu0T0.C b/macro/tof/beamtime/feb15/pl_over_clu0T0.C
index f6d8d1a1e3..c480e0702f 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu0T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0T0.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu1.C b/macro/tof/beamtime/feb15/pl_over_clu1.C
index 3792a2d305..0d30825ece 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu1.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu1.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu1.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2.C b/macro/tof/beamtime/feb15/pl_over_clu2.C
index 7b6361f2db..7e6ae43443 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2T.C b/macro/tof/beamtime/feb15/pl_over_clu2T.C
index 62232f1e64..548655afe8 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2T.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2T.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2T0.C b/macro/tof/beamtime/feb15/pl_over_clu2T0.C
index 2cf57e3383..548655afe8 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T0.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2trg0.C b/macro/tof/beamtime/feb15/pl_over_clu2trg0.C
index 55dca170ad..829d747e11 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2trg0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2trg0.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu4.C b/macro/tof/beamtime/feb15/pl_over_clu4.C
index 3b4e9cc210..5f964e9f73 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu4.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu4.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu4.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu4T0.C b/macro/tof/beamtime/feb15/pl_over_clu4T0.C
index a0511d536e..6d3afd7919 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu4T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu4T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu4T0.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu5.C b/macro/tof/beamtime/feb15/pl_over_clu5.C
index 484eb247d6..743a7bea2e 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu5.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu5.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu5.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu6.C b/macro/tof/beamtime/feb15/pl_over_clu6.C
index cc16d18080..0bcc770ca1 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu6.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu6.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu6.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu7.C b/macro/tof/beamtime/feb15/pl_over_clu7.C
index 72accf6782..8dad0767b7 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu7.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu7.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu7.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu7T0.C b/macro/tof/beamtime/feb15/pl_over_clu7T0.C
index 6867340220..c3e5d85c12 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu7T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu7T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu7T0.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_clu8.C b/macro/tof/beamtime/feb15/pl_over_clu8.C
index 01ef378a35..1d90c415ac 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu8.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu8.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu8.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_cluSel.C b/macro/tof/beamtime/feb15/pl_over_cluSel.C
index fc45e686e3..c6633a9c56 100644
--- a/macro/tof/beamtime/feb15/pl_over_cluSel.C
+++ b/macro/tof/beamtime/feb15/pl_over_cluSel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cluSel.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clust.C b/macro/tof/beamtime/feb15/pl_over_clust.C
index a6e356235b..179ce00364 100644
--- a/macro/tof/beamtime/feb15/pl_over_clust.C
+++ b/macro/tof/beamtime/feb15/pl_over_clust.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clust.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_cor.C b/macro/tof/beamtime/feb15/pl_over_cor.C
index 2a92ce28aa..69b7bb56b5 100644
--- a/macro/tof/beamtime/feb15/pl_over_cor.C
+++ b/macro/tof/beamtime/feb15/pl_over_cor.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cor.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cor(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_off.C b/macro/tof/beamtime/feb15/pl_over_off.C
index 223327dd59..365522ac79 100644
--- a/macro/tof/beamtime/feb15/pl_over_off.C
+++ b/macro/tof/beamtime/feb15/pl_over_off.C
@@ -1,6 +1,3 @@
-/** @file pl_over_off.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_off(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_pla.C b/macro/tof/beamtime/feb15/pl_over_pla.C
index 08e1cf50c8..f860dcd627 100644
--- a/macro/tof/beamtime/feb15/pl_over_pla.C
+++ b/macro/tof/beamtime/feb15/pl_over_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_over_pla.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_over_trb_ct.C b/macro/tof/beamtime/feb15/pl_over_trb_ct.C
index 697a7f2d73..5cf941221e 100644
--- a/macro/tof/beamtime/feb15/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/feb15/pl_over_trb_ct.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ct.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_trb_ft.C b/macro/tof/beamtime/feb15/pl_over_trb_ft.C
index 8e12c25ade..6541d18f75 100644
--- a/macro/tof/beamtime/feb15/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/feb15/pl_over_trb_ft.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ft.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_trk.C b/macro/tof/beamtime/feb15/pl_over_trk.C
index 35b60778b0..211911dffe 100644
--- a/macro/tof/beamtime/feb15/pl_over_trk.C
+++ b/macro/tof/beamtime/feb15/pl_over_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trk(Int_t NSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_vftx.C b/macro/tof/beamtime/feb15/pl_over_vftx.C
index 67d289e2bd..3a318b8546 100644
--- a/macro/tof/beamtime/feb15/pl_over_vftx.C
+++ b/macro/tof/beamtime/feb15/pl_over_vftx.C
@@ -1,6 +1,3 @@
-/** @file pl_over_vftx.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/feb15/pl_page.C b/macro/tof/beamtime/feb15/pl_page.C
index 56e14c3334..15b54f955e 100644
--- a/macro/tof/beamtime/feb15/pl_page.C
+++ b/macro/tof/beamtime/feb15/pl_page.C
@@ -1,6 +1,3 @@
-/** @file pl_page.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_page(Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
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 59cda8a2b5..b395202cce 100644
--- a/macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C
+++ b/macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C
@@ -1,6 +1,3 @@
-/** @file pl_pla_res_vs_tot.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 05eba92df3..8db2c8a629 100644
--- a/macro/tof/beamtime/feb15/pl_pla_resolution.C
+++ b/macro/tof/beamtime/feb15/pl_pla_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_pla_resolution.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 966a3c3362..3e1d40b11e 100644
--- a/macro/tof/beamtime/feb15/pl_pull_trk.C
+++ b/macro/tof/beamtime/feb15/pl_pull_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_pull_trk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_pull_trk(Int_t NSt = 5, char* var = "X", Int_t iFit = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_tdc_ref_res.C b/macro/tof/beamtime/feb15/pl_tdc_ref_res.C
index f6031ac8cb..62cf972278 100644
--- a/macro/tof/beamtime/feb15/pl_tdc_ref_res.C
+++ b/macro/tof/beamtime/feb15/pl_tdc_ref_res.C
@@ -1,6 +1,4 @@
-/** @file pl_tdc_ref_res.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_tdc_ref_res(Int_t fNumberOfTDC = 34)
 {
   // Monitoring of the TDc resolution stability using reference channel
diff --git a/macro/tof/beamtime/feb15/pl_time_resolution.C b/macro/tof/beamtime/feb15/pl_time_resolution.C
index 9bb0acd905..9a7c41bcf4 100644
--- a/macro/tof/beamtime/feb15/pl_time_resolution.C
+++ b/macro/tof/beamtime/feb15/pl_time_resolution.C
@@ -1,8 +1,6 @@
-/** @file pl_time_resolution.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_time_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2)
 {
+
   delete gROOT->FindObjectAny("tHistogram");
 
   FairRootManager* tManager = FairRootManager::Instance();
diff --git a/macro/tof/beamtime/feb15/pl_tot_per_channel.C b/macro/tof/beamtime/feb15/pl_tot_per_channel.C
index b42eeffea0..713971c1e9 100644
--- a/macro/tof/beamtime/feb15/pl_tot_per_channel.C
+++ b/macro/tof/beamtime/feb15/pl_tot_per_channel.C
@@ -1,6 +1,3 @@
-/** @file pl_tot_per_channel.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_tot_per_channel(UInt_t uTdcNumber)
 {
   Int_t const kTdcChNb = 16;
diff --git a/macro/tof/beamtime/feb15/pl_vert_trk.C b/macro/tof/beamtime/feb15/pl_vert_trk.C
index be110a5910..dd73207fd8 100644
--- a/macro/tof/beamtime/feb15/pl_vert_trk.C
+++ b/macro/tof/beamtime/feb15/pl_vert_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_vert_trk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_vert_trk()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/plot_Flux.C b/macro/tof/beamtime/feb15/plot_Flux.C
index 1bf75cfc82..a5f011f4d9 100644
--- a/macro/tof/beamtime/feb15/plot_Flux.C
+++ b/macro/tof/beamtime/feb15/plot_Flux.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/feb15/plot_Flux_Date.C b/macro/tof/beamtime/feb15/plot_Flux_Date.C
index d2f8677f34..bebade7378 100644
--- a/macro/tof/beamtime/feb15/plot_Flux_Date.C
+++ b/macro/tof/beamtime/feb15/plot_Flux_Date.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/feb15/rates_unpacking.C b/macro/tof/beamtime/feb15/rates_unpacking.C
index 65f5f7a9ac..55071b7724 100644
--- a/macro/tof/beamtime/feb15/rates_unpacking.C
+++ b/macro/tof/beamtime/feb15/rates_unpacking.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/feb15/rootlogon.C b/macro/tof/beamtime/feb15/rootlogon.C
index 3e695d2217..56774779ce 100644
--- a/macro/tof/beamtime/feb15/rootlogon.C
+++ b/macro/tof/beamtime/feb15/rootlogon.C
@@ -1,6 +1,3 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   cout << " Executing rootlogon.C (nh)" << endl;
   gStyle->SetOptStat(111);
diff --git a/macro/tof/beamtime/feb15/unpackCalib.C b/macro/tof/beamtime/feb15/unpackCalib.C
index dc789cb7b2..a7670b861c 100644
--- a/macro/tof/beamtime/feb15/unpackCalib.C
+++ b/macro/tof/beamtime/feb15/unpackCalib.C
@@ -1,6 +1,3 @@
-/** @file unpackCalib.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void unpackCalib(char* cFileId = "CernSps05Mar0041")
 {
   FairRunOnline* run = new FairRunOnline();
diff --git a/macro/tof/beamtime/feb15/unpackRun.C b/macro/tof/beamtime/feb15/unpackRun.C
index ef7db19a76..4766a34b3e 100644
--- a/macro/tof/beamtime/feb15/unpackRun.C
+++ b/macro/tof/beamtime/feb15/unpackRun.C
@@ -1,6 +1,3 @@
-/** @file unpackRun.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void unpackRun(char* cFileId = "CernSps05Mar0041")
 {
   FairRunOnline* run = new FairRunOnline();
diff --git a/macro/tof/beamtime/fit_ybox.C b/macro/tof/beamtime/fit_ybox.C
index 4f16aeb17f..1a55a78941 100644
--- a/macro/tof/beamtime/fit_ybox.C
+++ b/macro/tof/beamtime/fit_ybox.C
@@ -1,6 +1,3 @@
-/** @file fit_ybox.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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 ec9ea8151f..09499d3150 100644
--- a/macro/tof/beamtime/get4/set_Get4v1Cond.C
+++ b/macro/tof/beamtime/get4/set_Get4v1Cond.C
@@ -1,6 +1,3 @@
-/** @file set_Get4v1Cond.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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 a43dfe82ba..e3a80e2694 100644
--- a/macro/tof/beamtime/get4/set_Get4v1Par.C
+++ b/macro/tof/beamtime/get4/set_Get4v1Par.C
@@ -1,6 +1,3 @@
-/** @file set_Get4v1Par.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 cb5c69926a..241986c6c1 100644
--- a/macro/tof/beamtime/get4/unpack_get4_Fair.C
+++ b/macro/tof/beamtime/get4/unpack_get4_Fair.C
@@ -1,6 +1,3 @@
-/** @file unpack_get4_Fair.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/tof/beamtime/invert_matrix.C b/macro/tof/beamtime/invert_matrix.C
index f373b97a3f..454e7290fa 100644
--- a/macro/tof/beamtime/invert_matrix.C
+++ b/macro/tof/beamtime/invert_matrix.C
@@ -1,6 +1,3 @@
-/** @file invert_matrix.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void invert_matrix(Int_t NSt = 3, char* var = "X", Int_t iFit = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/ana_digi.C b/macro/tof/beamtime/lab16/ana_digi.C
index 3a27ac881f..6004f6446d 100644
--- a/macro/tof/beamtime/lab16/ana_digi.C
+++ b/macro/tof/beamtime/lab16/ana_digi.C
@@ -1,6 +1,3 @@
-/** @file ana_digi.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Bool_t bAvWalk = kTRUE)
diff --git a/macro/tof/beamtime/lab16/ana_digi_cal.C b/macro/tof/beamtime/lab16/ana_digi_cal.C
index ea2934d646..083d55ad8b 100644
--- a/macro/tof/beamtime/lab16/ana_digi_cal.C
+++ b/macro/tof/beamtime/lab16/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 97209dda00..d6db84da2b 100644
--- a/macro/tof/beamtime/lab16/ana_digi_cal_self.C
+++ b/macro/tof/beamtime/lab16/ana_digi_cal_self.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal_self.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 ce308ff85b..cc788ea3e2 100644
--- a/macro/tof/beamtime/lab16/ana_digi_ini.C
+++ b/macro/tof/beamtime/lab16/ana_digi_ini.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_ini.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 ed7e2750d3..c2415ab4ed 100644
--- a/macro/tof/beamtime/lab16/ana_digi_nh.C
+++ b/macro/tof/beamtime/lab16/ana_digi_nh.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_nh.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Bool_t bAvWalk = kTRUE)
diff --git a/macro/tof/beamtime/lab16/ana_hits.C b/macro/tof/beamtime/lab16/ana_hits.C
index 08205c8d9d..662a1567a5 100644
--- a/macro/tof/beamtime/lab16/ana_hits.C
+++ b/macro/tof/beamtime/lab16/ana_hits.C
@@ -1,6 +1,3 @@
-/** @file ana_hits.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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.,
               Double_t dChi2Lim2 = 10.)
diff --git a/macro/tof/beamtime/lab16/ana_hits_nh.C b/macro/tof/beamtime/lab16/ana_hits_nh.C
index 468d363ec3..c481fa2257 100644
--- a/macro/tof/beamtime/lab16/ana_hits_nh.C
+++ b/macro/tof/beamtime/lab16/ana_hits_nh.C
@@ -1,6 +1,3 @@
-/** @file ana_hits_nh.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/basic_unpacking.C b/macro/tof/beamtime/lab16/basic_unpacking.C
index 8becb1dddf..4ddab81409 100644
--- a/macro/tof/beamtime/lab16/basic_unpacking.C
+++ b/macro/tof/beamtime/lab16/basic_unpacking.C
@@ -1,6 +1,3 @@
-/** @file basic_unpacking.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/dis_digi.C b/macro/tof/beamtime/lab16/dis_digi.C
index e71930980e..c241423d3b 100644
--- a/macro/tof/beamtime/lab16/dis_digi.C
+++ b/macro/tof/beamtime/lab16/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Int_t iTrackingSetup = 0)
diff --git a/macro/tof/beamtime/lab16/dis_hits.C b/macro/tof/beamtime/lab16/dis_hits.C
index bc250ba017..967450000d 100644
--- a/macro/tof/beamtime/lab16/dis_hits.C
+++ b/macro/tof/beamtime/lab16/dis_hits.C
@@ -1,6 +1,3 @@
-/** @file dis_hits.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 df565bfd8f..e47cb31cf4 100644
--- a/macro/tof/beamtime/lab16/hld_unpack.C
+++ b/macro/tof/beamtime/lab16/hld_unpack.C
@@ -1,6 +1,3 @@
-/** @file hld_unpack.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/merge_rate.C b/macro/tof/beamtime/lab16/merge_rate.C
index 5d206957dd..e99ef082a5 100644
--- a/macro/tof/beamtime/lab16/merge_rate.C
+++ b/macro/tof/beamtime/lab16/merge_rate.C
@@ -1,6 +1,5 @@
-/** @file merge_rate.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void merge_rate()
 {
   TChain* inputChain = new TChain("cbmsim");
diff --git a/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C b/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C
index 745b0f17c2..84c512bbeb 100644
--- a/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C
+++ b/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C
@@ -1,6 +1,5 @@
-/** @file pl_TdcChannelCoincidences.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void pl_TdcChannelCoincidences(
   const TString& sTreeFile = "unpack_CbmTofQa_28May1635_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root",
   bool usePlaMultEvents    = 1)
diff --git a/macro/tof/beamtime/lab16/pl_all_time_resolution.C b/macro/tof/beamtime/lab16/pl_all_time_resolution.C
index 6150752569..414d1bdf98 100644
--- a/macro/tof/beamtime/lab16/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/lab16/pl_all_time_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_all_time_resolution.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_time_resolution(
   UInt_t uTdcNumber1, UInt_t uTdcNumber2,
   const TString& sTreeFile = "unpack_CbmTofQa_05Jun1043_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root",
diff --git a/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C b/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C
index 5a7891502d..f52ddb5576 100644
--- a/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trb_evtsize.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc.C b/macro/tof/beamtime/lab16/pl_all_trbtdc.C
index 6f1f10cf3e..2849872cd1 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
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 53b43f55c0..d232607aac 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_proc_status.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C b/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C
index a1cac9954d..0826c49761 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_refs.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C b/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C
index 6773220415..aeca9a8058 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_words.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/pl_over_trb_ct.C b/macro/tof/beamtime/lab16/pl_over_trb_ct.C
index 20fcea6800..5cf941221e 100644
--- a/macro/tof/beamtime/lab16/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/lab16/pl_over_trb_ct.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ct.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/pl_over_trb_ft.C b/macro/tof/beamtime/lab16/pl_over_trb_ft.C
index 568bca9809..6541d18f75 100644
--- a/macro/tof/beamtime/lab16/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/lab16/pl_over_trb_ft.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ft.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/lab16/plot_Flux.C b/macro/tof/beamtime/lab16/plot_Flux.C
index b905f0d7d9..a5f011f4d9 100644
--- a/macro/tof/beamtime/lab16/plot_Flux.C
+++ b/macro/tof/beamtime/lab16/plot_Flux.C
@@ -1,6 +1,3 @@
-/** @file plot_Flux.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/lab16/plot_Flux_Date.C b/macro/tof/beamtime/lab16/plot_Flux_Date.C
index 4fe37299a1..3cf79c0e29 100644
--- a/macro/tof/beamtime/lab16/plot_Flux_Date.C
+++ b/macro/tof/beamtime/lab16/plot_Flux_Date.C
@@ -1,6 +1,3 @@
-/** @file plot_Flux_Date.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/lab16/rates_monitoring.C b/macro/tof/beamtime/lab16/rates_monitoring.C
index 5469feff92..3f7eafb2c5 100644
--- a/macro/tof/beamtime/lab16/rates_monitoring.C
+++ b/macro/tof/beamtime/lab16/rates_monitoring.C
@@ -1,6 +1,3 @@
-/** @file rates_monitoring.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/lab16/rates_unpacking.C b/macro/tof/beamtime/lab16/rates_unpacking.C
index b2b2087795..55071b7724 100644
--- a/macro/tof/beamtime/lab16/rates_unpacking.C
+++ b/macro/tof/beamtime/lab16/rates_unpacking.C
@@ -1,6 +1,3 @@
-/** @file rates_unpacking.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/lab16/rootlogon.C b/macro/tof/beamtime/lab16/rootlogon.C
index 21e34d008c..01ea59afd9 100644
--- a/macro/tof/beamtime/lab16/rootlogon.C
+++ b/macro/tof/beamtime/lab16/rootlogon.C
@@ -1,6 +1,3 @@
-/** @file rootlogon.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   cout << " Executing rootlogon.C (nh)" << endl;
   gStyle->SetOptStat(111);
diff --git a/macro/tof/beamtime/lab16/tdcref_monitoring.C b/macro/tof/beamtime/lab16/tdcref_monitoring.C
index 3601233a1f..14b233e01f 100644
--- a/macro/tof/beamtime/lab16/tdcref_monitoring.C
+++ b/macro/tof/beamtime/lab16/tdcref_monitoring.C
@@ -1,6 +1,3 @@
-/** @file tdcref_monitoring.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C b/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C
index 9e9cf3477f..0a2e2d3d2b 100644
--- a/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C
+++ b/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C
@@ -1,6 +1,3 @@
-/** @file tdcref_monitoring_auto.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/unpackCalib.C b/macro/tof/beamtime/lab16/unpackCalib.C
index 7a3c3db1b7..39ff7480a8 100644
--- a/macro/tof/beamtime/lab16/unpackCalib.C
+++ b/macro/tof/beamtime/lab16/unpackCalib.C
@@ -1,6 +1,3 @@
-/** @file unpackCalib.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void unpackCalib(char* cFileId = "CbmTofSps_01Dec0206")
 {
   FairRunOnline* run = new FairRunOnline();
diff --git a/macro/tof/beamtime/lab16/unpackRun.C b/macro/tof/beamtime/lab16/unpackRun.C
index 707fcd3730..665b044d85 100644
--- a/macro/tof/beamtime/lab16/unpackRun.C
+++ b/macro/tof/beamtime/lab16/unpackRun.C
@@ -1,6 +1,3 @@
-/** @file unpackRun.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void unpackRun(char* cFileId = "CbmTofSps_01Dec0206")
 {
   FairRunOnline* run = new FairRunOnline();
diff --git a/macro/tof/beamtime/load_hst.C b/macro/tof/beamtime/load_hst.C
index e362410ff6..7346802673 100644
--- a/macro/tof/beamtime/load_hst.C
+++ b/macro/tof/beamtime/load_hst.C
@@ -1,6 +1,3 @@
-/** @file load_hst.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void load_hst(TString cstr = "hst/default.hst.root")
 {
   // Read histogramms from the file
diff --git a/macro/tof/beamtime/nov15/ana_calib_hits.C b/macro/tof/beamtime/nov15/ana_calib_hits.C
index 1008dbee57..d9c5cbd1a0 100644
--- a/macro/tof/beamtime/nov15/ana_calib_hits.C
+++ b/macro/tof/beamtime/nov15/ana_calib_hits.C
@@ -1,6 +1,3 @@
-/** @file ana_calib_hits.C
-  * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- ana_calib_hits.C                                                  -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/ana_digi.C b/macro/tof/beamtime/nov15/ana_digi.C
index 59d1bb20c2..0aee70aae4 100644
--- a/macro/tof/beamtime/nov15/ana_digi.C
+++ b/macro/tof/beamtime/nov15/ana_digi.C
@@ -1,6 +1,3 @@
-/** @file ana_digi.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 b413947b50..2136598ebe 100644
--- a/macro/tof/beamtime/nov15/ana_digi_cal.C
+++ b/macro/tof/beamtime/nov15/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 51af0e61c3..c76bc36e17 100644
--- a/macro/tof/beamtime/nov15/ana_digi_ini.C
+++ b/macro/tof/beamtime/nov15/ana_digi_ini.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_ini.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 25bf500b01..ad4d050c06 100644
--- a/macro/tof/beamtime/nov15/ana_hits.C
+++ b/macro/tof/beamtime/nov15/ana_hits.C
@@ -1,6 +1,3 @@
-/** @file ana_hits.C
-  * @copyright Copyright (C) 2016-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 954b349b44..5803ee5c6f 100644
--- a/macro/tof/beamtime/nov15/ana_trks.C
+++ b/macro/tof/beamtime/nov15/ana_trks.C
@@ -1,6 +1,3 @@
-/** @file ana_trks.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/basic_unpacking.C b/macro/tof/beamtime/nov15/basic_unpacking.C
index baf2ae0b6f..4ddab81409 100644
--- a/macro/tof/beamtime/nov15/basic_unpacking.C
+++ b/macro/tof/beamtime/nov15/basic_unpacking.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/calib_digi.C b/macro/tof/beamtime/nov15/calib_digi.C
index cfbdbcf586..a63c3b89f9 100644
--- a/macro/tof/beamtime/nov15/calib_digi.C
+++ b/macro/tof/beamtime/nov15/calib_digi.C
@@ -1,6 +1,3 @@
-/** @file calib_digi.C
-  * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- calib_digi.C                                                      -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/calib_digi_cal.C b/macro/tof/beamtime/nov15/calib_digi_cal.C
index d3f1cddc52..2f7c0fd259 100644
--- a/macro/tof/beamtime/nov15/calib_digi_cal.C
+++ b/macro/tof/beamtime/nov15/calib_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file calib_digi_cal.C
-  * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- 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 209a75d181..3e4cfc6db0 100644
--- a/macro/tof/beamtime/nov15/calib_digi_ini.C
+++ b/macro/tof/beamtime/nov15/calib_digi_ini.C
@@ -1,6 +1,3 @@
-/** @file calib_digi_ini.C
-  * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- calib_digi_ini.C                                                  -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/current/FileListDef.h b/macro/tof/beamtime/nov15/current/FileListDef.h
index ef909b59d4..9b39a83d57 100644
--- a/macro/tof/beamtime/nov15/current/FileListDef.h
+++ b/macro/tof/beamtime/nov15/current/FileListDef.h
@@ -1,8 +1,6 @@
-/** @file FileListDef.h
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Definitions for the HV monitoring in Nov. 2015 beamtime at CERN SPS
 // 15/12/2015, P.-A. Loizeau
+
 /************************ Files definitions *************************/
 // 2015-11-26 1
 // 261115
diff --git a/macro/tof/beamtime/nov15/current/StructDef.h b/macro/tof/beamtime/nov15/current/StructDef.h
index 4245f64aa8..b689d74609 100644
--- a/macro/tof/beamtime/nov15/current/StructDef.h
+++ b/macro/tof/beamtime/nov15/current/StructDef.h
@@ -1,7 +1,6 @@
-/** @file StructDef.h
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 //#include "Riostream.h"
+
 typedef struct Rpc_HV {
   Int_t iTimeSec;
   Int_t iTimeMilliSec;
diff --git a/macro/tof/beamtime/nov15/current/currentTreeConv.C b/macro/tof/beamtime/nov15/current/currentTreeConv.C
index 9e9e7c7ff7..5402d9ed90 100644
--- a/macro/tof/beamtime/nov15/current/currentTreeConv.C
+++ b/macro/tof/beamtime/nov15/current/currentTreeConv.C
@@ -1,6 +1,3 @@
-/** @file currentTreeConv.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ROOT headers
 #include "TFile.h"
 #include "TObjArray.h"
diff --git a/macro/tof/beamtime/nov15/current/loopTreeConv.C b/macro/tof/beamtime/nov15/current/loopTreeConv.C
index f40e018dc0..9afa530c54 100644
--- a/macro/tof/beamtime/nov15/current/loopTreeConv.C
+++ b/macro/tof/beamtime/nov15/current/loopTreeConv.C
@@ -1,7 +1,5 @@
-/** @file loopTreeConv.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "FileListDef.h"
+
 Bool_t loopTreeConv(Int_t iSecOffset = 0, Int_t iMilliSecOffset = 0)
 {
 
diff --git a/macro/tof/beamtime/nov15/current/mergeTrees.C b/macro/tof/beamtime/nov15/current/mergeTrees.C
index 4b9e52f9c0..01abe53709 100644
--- a/macro/tof/beamtime/nov15/current/mergeTrees.C
+++ b/macro/tof/beamtime/nov15/current/mergeTrees.C
@@ -1,7 +1,6 @@
-/** @file mergeTrees.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "TString.h"
+
 #include "FileListDef.h"
 
 Bool_t mergeTrees()
diff --git a/macro/tof/beamtime/nov15/current/plot_Current_Date.C b/macro/tof/beamtime/nov15/current/plot_Current_Date.C
index 7b143d431c..d00069fdc4 100644
--- a/macro/tof/beamtime/nov15/current/plot_Current_Date.C
+++ b/macro/tof/beamtime/nov15/current/plot_Current_Date.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 #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 679986363a..87d66c70b3 100644
--- a/macro/tof/beamtime/nov15/dis_digi.C
+++ b/macro/tof/beamtime/nov15/dis_digi.C
@@ -1,6 +1,3 @@
-/** @file dis_digi.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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,
               Int_t iTrackingSetup = 0)
diff --git a/macro/tof/beamtime/nov15/dis_hits.C b/macro/tof/beamtime/nov15/dis_hits.C
index 36d9835198..c3346ceaa9 100644
--- a/macro/tof/beamtime/nov15/dis_hits.C
+++ b/macro/tof/beamtime/nov15/dis_hits.C
@@ -1,6 +1,3 @@
-/** @file dis_hits.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 e219007bf5..9957472eff 100644
--- a/macro/tof/beamtime/nov15/hld_unpack.C
+++ b/macro/tof/beamtime/nov15/hld_unpack.C
@@ -1,6 +1,3 @@
-/** @file hld_unpack.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/merge_rate.C b/macro/tof/beamtime/nov15/merge_rate.C
index 1584258c6b..350dbe9b33 100644
--- a/macro/tof/beamtime/nov15/merge_rate.C
+++ b/macro/tof/beamtime/nov15/merge_rate.C
@@ -1,6 +1,5 @@
-/** @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 **/
+
+
 void merge_rate()
 {
   TChain* inputChain = new TChain("cbmsim");
diff --git a/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C b/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C
index 21704f745f..84c512bbeb 100644
--- a/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C
+++ b/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C
@@ -1,6 +1,5 @@
-/** @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 **/
+
+
 void pl_TdcChannelCoincidences(
   const TString& sTreeFile = "unpack_CbmTofQa_28May1635_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root",
   bool usePlaMultEvents    = 1)
diff --git a/macro/tof/beamtime/nov15/pl_all_time_resolution.C b/macro/tof/beamtime/nov15/pl_all_time_resolution.C
index 6e2d20e5ab..414d1bdf98 100644
--- a/macro/tof/beamtime/nov15/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/nov15/pl_all_time_resolution.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_time_resolution(
   UInt_t uTdcNumber1, UInt_t uTdcNumber2,
   const TString& sTreeFile = "unpack_CbmTofQa_05Jun1043_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root",
diff --git a/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C b/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C
index f5ff575662..f52ddb5576 100644
--- a/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc.C b/macro/tof/beamtime/nov15/pl_all_trbtdc.C
index b817718891..2849872cd1 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
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 e26a0e2272..d232607aac 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C b/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C
index 4d16f7ce76..0826c49761 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C b/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C
index c13f66d7b9..aeca9a8058 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/nov15/pl_over_trb_ct.C b/macro/tof/beamtime/nov15/pl_over_trb_ct.C
index 0a724a486d..5cf941221e 100644
--- a/macro/tof/beamtime/nov15/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/nov15/pl_over_trb_ct.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/nov15/pl_over_trb_ft.C b/macro/tof/beamtime/nov15/pl_over_trb_ft.C
index 37da1f4808..6541d18f75 100644
--- a/macro/tof/beamtime/nov15/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/nov15/pl_over_trb_ft.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/nov15/plot_Flux.C b/macro/tof/beamtime/nov15/plot_Flux.C
index 1bf75cfc82..a5f011f4d9 100644
--- a/macro/tof/beamtime/nov15/plot_Flux.C
+++ b/macro/tof/beamtime/nov15/plot_Flux.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/nov15/plot_Flux_Date.C b/macro/tof/beamtime/nov15/plot_Flux_Date.C
index 6649fe100b..e25e69ff59 100644
--- a/macro/tof/beamtime/nov15/plot_Flux_Date.C
+++ b/macro/tof/beamtime/nov15/plot_Flux_Date.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/nov15/rates_monitoring.C b/macro/tof/beamtime/nov15/rates_monitoring.C
index d4e822f424..3f7eafb2c5 100644
--- a/macro/tof/beamtime/nov15/rates_monitoring.C
+++ b/macro/tof/beamtime/nov15/rates_monitoring.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/nov15/rates_unpacking.C b/macro/tof/beamtime/nov15/rates_unpacking.C
index 73dc2790d2..a193fbb82e 100644
--- a/macro/tof/beamtime/nov15/rates_unpacking.C
+++ b/macro/tof/beamtime/nov15/rates_unpacking.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // ----- intended use: unpacking of rate data acquired with MBS            -----
diff --git a/macro/tof/beamtime/nov15/rootlogon.C b/macro/tof/beamtime/nov15/rootlogon.C
index a40106db10..56774779ce 100644
--- a/macro/tof/beamtime/nov15/rootlogon.C
+++ b/macro/tof/beamtime/nov15/rootlogon.C
@@ -1,6 +1,3 @@
-/** @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 **/
 {
   cout << " Executing rootlogon.C (nh)" << endl;
   gStyle->SetOptStat(111);
diff --git a/macro/tof/beamtime/nov15/tdcref_monitoring.C b/macro/tof/beamtime/nov15/tdcref_monitoring.C
index fc4c7bd0ca..14b233e01f 100644
--- a/macro/tof/beamtime/nov15/tdcref_monitoring.C
+++ b/macro/tof/beamtime/nov15/tdcref_monitoring.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C b/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C
index 091fc59e2c..698dcb66f2 100644
--- a/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C
+++ b/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/unpackCalib.C b/macro/tof/beamtime/nov15/unpackCalib.C
index 7a3c3db1b7..39ff7480a8 100644
--- a/macro/tof/beamtime/nov15/unpackCalib.C
+++ b/macro/tof/beamtime/nov15/unpackCalib.C
@@ -1,6 +1,3 @@
-/** @file unpackCalib.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void unpackCalib(char* cFileId = "CbmTofSps_01Dec0206")
 {
   FairRunOnline* run = new FairRunOnline();
diff --git a/macro/tof/beamtime/nov15/unpackRun.C b/macro/tof/beamtime/nov15/unpackRun.C
index 3b3155b2ff..d8ca545f58 100644
--- a/macro/tof/beamtime/nov15/unpackRun.C
+++ b/macro/tof/beamtime/nov15/unpackRun.C
@@ -1,6 +1,3 @@
-/** @file unpackRun.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void unpackRun(char* cFileId = "CbmTofSps_01Dec0206")
 {
   FairRunOnline* run = new FairRunOnline();
diff --git a/macro/tof/beamtime/pl_Ana_Dut.C b/macro/tof/beamtime/pl_Ana_Dut.C
index 7a56092774..d40a497688 100644
--- a/macro/tof/beamtime/pl_Ana_Dut.C
+++ b/macro/tof/beamtime/pl_Ana_Dut.C
@@ -1,6 +1,3 @@
-/** @file pl_Ana_Dut.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_Ana_Dut(Int_t iDut = 3, Int_t iFit = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_DigiCor.C b/macro/tof/beamtime/pl_DigiCor.C
index 9e90ea63e6..5385a16983 100644
--- a/macro/tof/beamtime/pl_DigiCor.C
+++ b/macro/tof/beamtime/pl_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_DigiCor.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_DigiCor(Int_t SmT = 1, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_MulCor.C b/macro/tof/beamtime/pl_MulCor.C
index 2fbc02251f..11d208b1b4 100644
--- a/macro/tof/beamtime/pl_MulCor.C
+++ b/macro/tof/beamtime/pl_MulCor.C
@@ -1,6 +1,3 @@
-/** @file pl_MulCor.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_MulCor(Int_t SmT = 1, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_TIS.C b/macro/tof/beamtime/pl_TIS.C
index dbe5879c17..f08c8cb373 100644
--- a/macro/tof/beamtime/pl_TIS.C
+++ b/macro/tof/beamtime/pl_TIS.C
@@ -1,6 +1,3 @@
-/** @file pl_TIS.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 pl_TIS(Double_t dFracMax = 0.1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_XY_trk.C b/macro/tof/beamtime/pl_XY_trk.C
index 07e3662b54..782ca82108 100644
--- a/macro/tof/beamtime/pl_XY_trk.C
+++ b/macro/tof/beamtime/pl_XY_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_XY_trk.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_XY_trk(Int_t NSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_CluMul.C b/macro/tof/beamtime/pl_all_CluMul.C
index 06b8bfe0f9..f2fd4aa61a 100644
--- a/macro/tof/beamtime/pl_all_CluMul.C
+++ b/macro/tof/beamtime/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNDet = 8)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_DigiCor.C b/macro/tof/beamtime/pl_all_DigiCor.C
index 746db48f83..5c088c09ec 100644
--- a/macro/tof/beamtime/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 9)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_XY.C b/macro/tof/beamtime/pl_all_XY.C
index f45bd47fdc..556276ee16 100644
--- a/macro/tof/beamtime/pl_all_XY.C
+++ b/macro/tof/beamtime/pl_all_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_all_XY.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_XY(Int_t iNDet = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_cluDelTofSel.C b/macro/tof/beamtime/pl_all_cluDelTofSel.C
index 45ed26aac6..6efa4cded5 100644
--- a/macro/tof/beamtime/pl_all_cluDelTofSel.C
+++ b/macro/tof/beamtime/pl_all_cluDelTofSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluDelTofSel.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluDelTofSel(Int_t iNch = 1, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_cluWalk.C b/macro/tof/beamtime/pl_all_cluWalk.C
index 92d201e575..00e2327ad8 100644
--- a/macro/tof/beamtime/pl_all_cluWalk.C
+++ b/macro/tof/beamtime/pl_all_cluWalk.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalk.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_cluWalkSel.C b/macro/tof/beamtime/pl_all_cluWalkSel.C
index 17cb254832..ae3a76edfa 100644
--- a/macro/tof/beamtime/pl_all_cluWalkSel.C
+++ b/macro/tof/beamtime/pl_all_cluWalkSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalkSel.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_dTSel.C b/macro/tof/beamtime/pl_all_dTSel.C
index 685a846182..49717a4674 100644
--- a/macro/tof/beamtime/pl_all_dTSel.C
+++ b/macro/tof/beamtime/pl_all_dTSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_dTSel.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_dTSel(Int_t iNSel = 2)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_time_resolution.C b/macro/tof/beamtime/pl_all_time_resolution.C
index 1564601627..a13fa3eb55 100644
--- a/macro/tof/beamtime/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/pl_all_time_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_all_time_resolution.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_time_resolution(UInt_t uTdcNumber1, UInt_t uTdcNumber2)
 {
   Int_t const kTdcChNb = 16;
diff --git a/macro/tof/beamtime/pl_all_trb_evtsize.C b/macro/tof/beamtime/pl_all_trb_evtsize.C
index 5a7891502d..f52ddb5576 100644
--- a/macro/tof/beamtime/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/pl_all_trb_evtsize.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trb_evtsize.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_trbtdc.C b/macro/tof/beamtime/pl_all_trbtdc.C
index 6f1f10cf3e..2849872cd1 100644
--- a/macro/tof/beamtime/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/pl_all_trbtdc.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/pl_all_trbtdc_proc_status.C
index 53b43f55c0..d232607aac 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_proc_status.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_proc_status.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_trbtdc_refs.C b/macro/tof/beamtime/pl_all_trbtdc_refs.C
index a1cac9954d..0826c49761 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_refs.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_refs.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_trbtdc_tot.C b/macro/tof/beamtime/pl_all_trbtdc_tot.C
index 777869a9a8..2c34336934 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_tot.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_tot.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_tot.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_tot(Int_t iTdc = 34)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_all_trbtdc_words.C b/macro/tof/beamtime/pl_all_trbtdc_words.C
index 6773220415..aeca9a8058 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_words.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_words.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_ana_DTXY.C b/macro/tof/beamtime/pl_ana_DTXY.C
index 8954ec4fa1..1085e270b4 100644
--- a/macro/tof/beamtime/pl_ana_DTXY.C
+++ b/macro/tof/beamtime/pl_ana_DTXY.C
@@ -1,6 +1,3 @@
-/** @file pl_ana_DTXY.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_ana_DTXY(Int_t iDut = 9, Int_t NewNbinsX = 3, Int_t NewNbinsY = 3, Int_t iOpt = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_calib_trk.C b/macro/tof/beamtime/pl_calib_trk.C
index 75171ba9c0..fba44b6c5a 100644
--- a/macro/tof/beamtime/pl_calib_trk.C
+++ b/macro/tof/beamtime/pl_calib_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_calib_trk.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_calib_trk()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_deb_pla.C b/macro/tof/beamtime/pl_deb_pla.C
index 89e09cda49..3502d5d7f7 100644
--- a/macro/tof/beamtime/pl_deb_pla.C
+++ b/macro/tof/beamtime/pl_deb_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_deb_pla.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_diam_tres.C b/macro/tof/beamtime/pl_diam_tres.C
index 485fcf1706..0f5a1bbdaa 100644
--- a/macro/tof/beamtime/pl_diam_tres.C
+++ b/macro/tof/beamtime/pl_diam_tres.C
@@ -1,6 +1,3 @@
-/** @file pl_diam_tres.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_diam_tres(UInt_t uTdcNumber1 = 32, UInt_t uTdcNumber2 = 33)
 {
   const Int_t kiNbCh = 16;
diff --git a/macro/tof/beamtime/pl_eff_XY.C b/macro/tof/beamtime/pl_eff_XY.C
index 585f45bfb7..20b6042ee1 100644
--- a/macro/tof/beamtime/pl_eff_XY.C
+++ b/macro/tof/beamtime/pl_eff_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_eff_XY.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_eff_XY(Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_info_2D.C b/macro/tof/beamtime/pl_info_2D.C
index 78deb7d4cc..4c41ee0e30 100644
--- a/macro/tof/beamtime/pl_info_2D.C
+++ b/macro/tof/beamtime/pl_info_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_info_2D.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_2D(char* cHist = "hDTD4DT04D4best", Int_t iDBin = 1, Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_info_Chi2D.C b/macro/tof/beamtime/pl_info_Chi2D.C
index 4526f88838..f098507b25 100644
--- a/macro/tof/beamtime/pl_info_Chi2D.C
+++ b/macro/tof/beamtime/pl_info_Chi2D.C
@@ -1,6 +1,3 @@
-/** @file pl_info_Chi2D.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_Chi2D(char* cHist = "hChiDT04D4best", Int_t iDBin = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_info_Mat04D4best.C b/macro/tof/beamtime/pl_info_Mat04D4best.C
index e799269c69..0418ac2756 100644
--- a/macro/tof/beamtime/pl_info_Mat04D4best.C
+++ b/macro/tof/beamtime/pl_info_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_info_Mat04D4best.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_info_cluTot.C b/macro/tof/beamtime/pl_info_cluTot.C
index 868b9c28e8..3ab816732c 100644
--- a/macro/tof/beamtime/pl_info_cluTot.C
+++ b/macro/tof/beamtime/pl_info_cluTot.C
@@ -1,6 +1,3 @@
-/** @file pl_info_cluTot.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_cluTot(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_loc_XY.C b/macro/tof/beamtime/pl_loc_XY.C
index d4ef4fe705..8405ab7134 100644
--- a/macro/tof/beamtime/pl_loc_XY.C
+++ b/macro/tof/beamtime/pl_loc_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_loc_XY.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_loc_XY(Int_t iNDet = 10)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_map_debug.C b/macro/tof/beamtime/pl_map_debug.C
index 800f6320eb..053e99bf14 100644
--- a/macro/tof/beamtime/pl_map_debug.C
+++ b/macro/tof/beamtime/pl_map_debug.C
@@ -1,6 +1,4 @@
-/** @file pl_map_debug.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_map_debug(Int_t iFirstTdc = 30, Int_t iSecondTdc = 30)
 {
   // constants
diff --git a/macro/tof/beamtime/pl_moni_clu.C b/macro/tof/beamtime/pl_moni_clu.C
index 1d944062fd..1349f2be3c 100644
--- a/macro/tof/beamtime/pl_moni_clu.C
+++ b/macro/tof/beamtime/pl_moni_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_moni_clu.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_2hit.C b/macro/tof/beamtime/pl_over_2hit.C
index 6e642a9bbb..79d0bc0fd2 100644
--- a/macro/tof/beamtime/pl_over_2hit.C
+++ b/macro/tof/beamtime/pl_over_2hit.C
@@ -1,6 +1,3 @@
-/** @file pl_over_2hit.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_2hit(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_Mat04.C b/macro/tof/beamtime/pl_over_Mat04.C
index 406e6413a1..6416c2bc2c 100644
--- a/macro/tof/beamtime/pl_over_Mat04.C
+++ b/macro/tof/beamtime/pl_over_Mat04.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_Mat04D4best.C b/macro/tof/beamtime/pl_over_Mat04D4best.C
index e081e62c55..148d871845 100644
--- a/macro/tof/beamtime/pl_over_Mat04D4best.C
+++ b/macro/tof/beamtime/pl_over_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4best.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_Mat04D4sbest.C b/macro/tof/beamtime/pl_over_Mat04D4sbest.C
index fad64e9b64..6e7d38db64 100644
--- a/macro/tof/beamtime/pl_over_Mat04D4sbest.C
+++ b/macro/tof/beamtime/pl_over_Mat04D4sbest.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4sbest.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4sbest(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_Mat04best.C b/macro/tof/beamtime/pl_over_Mat04best.C
index fdd1d2b596..3a2cc8a6ff 100644
--- a/macro/tof/beamtime/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/pl_over_Mat04best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04best.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_Mat24.C b/macro/tof/beamtime/pl_over_Mat24.C
index 999bcb0b8e..d4bf23cd52 100644
--- a/macro/tof/beamtime/pl_over_Mat24.C
+++ b/macro/tof/beamtime/pl_over_Mat24.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat24.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_MatD4sel.C b/macro/tof/beamtime/pl_over_MatD4sel.C
index b4843cd55d..fd6baa2cb3 100644
--- a/macro/tof/beamtime/pl_over_MatD4sel.C
+++ b/macro/tof/beamtime/pl_over_MatD4sel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_MatD4sel.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_MatD4sel()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_XX.C b/macro/tof/beamtime/pl_over_XX.C
index 8d14764701..ee861265c9 100644
--- a/macro/tof/beamtime/pl_over_XX.C
+++ b/macro/tof/beamtime/pl_over_XX.C
@@ -1,6 +1,3 @@
-/** @file pl_over_XX.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_cl2g.C b/macro/tof/beamtime/pl_over_cl2g.C
index c04fb358b9..54153d3d6d 100644
--- a/macro/tof/beamtime/pl_over_cl2g.C
+++ b/macro/tof/beamtime/pl_over_cl2g.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cl2g.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_clu.C b/macro/tof/beamtime/pl_over_clu.C
index 4e52700e73..35e5b2d40a 100644
--- a/macro/tof/beamtime/pl_over_clu.C
+++ b/macro/tof/beamtime/pl_over_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu0.C b/macro/tof/beamtime/pl_over_clu0.C
index 88a7a22dd8..f595acb4c1 100644
--- a/macro/tof/beamtime/pl_over_clu0.C
+++ b/macro/tof/beamtime/pl_over_clu0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_clu0T0.C b/macro/tof/beamtime/pl_over_clu0T0.C
index 83eba6b613..c480e0702f 100644
--- a/macro/tof/beamtime/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/pl_over_clu0T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0T0.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_clu2T.C b/macro/tof/beamtime/pl_over_clu2T.C
index 5186f771fa..548655afe8 100644
--- a/macro/tof/beamtime/pl_over_clu2T.C
+++ b/macro/tof/beamtime/pl_over_clu2T.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_clu2T0.C b/macro/tof/beamtime/pl_over_clu2T0.C
index c8a11ab4bb..548655afe8 100644
--- a/macro/tof/beamtime/pl_over_clu2T0.C
+++ b/macro/tof/beamtime/pl_over_clu2T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T0.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_clu2trg0.C b/macro/tof/beamtime/pl_over_clu2trg0.C
index 81ddb8daea..829d747e11 100644
--- a/macro/tof/beamtime/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/pl_over_clu2trg0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2trg0.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_clu4T0.C b/macro/tof/beamtime/pl_over_clu4T0.C
index 2cbefc12a6..6d3afd7919 100644
--- a/macro/tof/beamtime/pl_over_clu4T0.C
+++ b/macro/tof/beamtime/pl_over_clu4T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu4T0.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_cluSel.C b/macro/tof/beamtime/pl_over_cluSel.C
index 0acc17c160..26e5af8120 100644
--- a/macro/tof/beamtime/pl_over_cluSel.C
+++ b/macro/tof/beamtime/pl_over_cluSel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cluSel.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clust.C b/macro/tof/beamtime/pl_over_clust.C
index 0b226df117..179ce00364 100644
--- a/macro/tof/beamtime/pl_over_clust.C
+++ b/macro/tof/beamtime/pl_over_clust.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clust.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_cor.C b/macro/tof/beamtime/pl_over_cor.C
index 172e3210f4..69b7bb56b5 100644
--- a/macro/tof/beamtime/pl_over_cor.C
+++ b/macro/tof/beamtime/pl_over_cor.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cor.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cor(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_off.C b/macro/tof/beamtime/pl_over_off.C
index 2c68cc6a21..365522ac79 100644
--- a/macro/tof/beamtime/pl_over_off.C
+++ b/macro/tof/beamtime/pl_over_off.C
@@ -1,6 +1,3 @@
-/** @file pl_over_off.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_off(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_pla.C b/macro/tof/beamtime/pl_over_pla.C
index b29831fa80..f860dcd627 100644
--- a/macro/tof/beamtime/pl_over_pla.C
+++ b/macro/tof/beamtime/pl_over_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_over_pla.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_over_trb_ct.C b/macro/tof/beamtime/pl_over_trb_ct.C
index 20fcea6800..5cf941221e 100644
--- a/macro/tof/beamtime/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/pl_over_trb_ct.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ct.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_trb_ft.C b/macro/tof/beamtime/pl_over_trb_ft.C
index 568bca9809..6541d18f75 100644
--- a/macro/tof/beamtime/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/pl_over_trb_ft.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ft.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_trk.C b/macro/tof/beamtime/pl_over_trk.C
index 8abe7bd194..bee19c802b 100644
--- a/macro/tof/beamtime/pl_over_trk.C
+++ b/macro/tof/beamtime/pl_over_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trk.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trk(Int_t NSt = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_vftx.C b/macro/tof/beamtime/pl_over_vftx.C
index d8a12c5f7f..3a318b8546 100644
--- a/macro/tof/beamtime/pl_over_vftx.C
+++ b/macro/tof/beamtime/pl_over_vftx.C
@@ -1,6 +1,3 @@
-/** @file pl_over_vftx.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_page.C b/macro/tof/beamtime/pl_page.C
index 3e4b6bb8d6..15b54f955e 100644
--- a/macro/tof/beamtime/pl_page.C
+++ b/macro/tof/beamtime/pl_page.C
@@ -1,6 +1,3 @@
-/** @file pl_page.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_page(Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_pla_res_vs_tot.C b/macro/tof/beamtime/pl_pla_res_vs_tot.C
index 2ffa0a16e3..b395202cce 100644
--- a/macro/tof/beamtime/pl_pla_res_vs_tot.C
+++ b/macro/tof/beamtime/pl_pla_res_vs_tot.C
@@ -1,6 +1,3 @@
-/** @file pl_pla_res_vs_tot.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 e900ffc975..8db2c8a629 100644
--- a/macro/tof/beamtime/pl_pla_resolution.C
+++ b/macro/tof/beamtime/pl_pla_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_pla_resolution.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 8f14388ab0..810940f891 100644
--- a/macro/tof/beamtime/pl_pull_trk.C
+++ b/macro/tof/beamtime/pl_pull_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_pull_trk.C
-  * @copyright Copyright (C) 2015-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_pull_trk(Int_t NSt = 8, char* var = "X", Int_t iFit = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_tdc_ref_res.C b/macro/tof/beamtime/pl_tdc_ref_res.C
index c5b064b2f7..a47a875ffc 100644
--- a/macro/tof/beamtime/pl_tdc_ref_res.C
+++ b/macro/tof/beamtime/pl_tdc_ref_res.C
@@ -1,6 +1,4 @@
-/** @file pl_tdc_ref_res.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_tdc_ref_res(Int_t fNumberOfTDC = 34)
 {
   // Monitoring of the TDc resolution stability using reference channel
diff --git a/macro/tof/beamtime/pl_time_resolution.C b/macro/tof/beamtime/pl_time_resolution.C
index da664d2759..9a7c41bcf4 100644
--- a/macro/tof/beamtime/pl_time_resolution.C
+++ b/macro/tof/beamtime/pl_time_resolution.C
@@ -1,8 +1,6 @@
-/** @file pl_time_resolution.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_time_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2)
 {
+
   delete gROOT->FindObjectAny("tHistogram");
 
   FairRootManager* tManager = FairRootManager::Instance();
diff --git a/macro/tof/beamtime/pl_tot_per_channel.C b/macro/tof/beamtime/pl_tot_per_channel.C
index dc6d98aa32..713971c1e9 100644
--- a/macro/tof/beamtime/pl_tot_per_channel.C
+++ b/macro/tof/beamtime/pl_tot_per_channel.C
@@ -1,6 +1,3 @@
-/** @file pl_tot_per_channel.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_tot_per_channel(UInt_t uTdcNumber)
 {
   Int_t const kTdcChNb = 16;
diff --git a/macro/tof/beamtime/pl_trigger.C b/macro/tof/beamtime/pl_trigger.C
index bee8a9be95..2c652a5485 100644
--- a/macro/tof/beamtime/pl_trigger.C
+++ b/macro/tof/beamtime/pl_trigger.C
@@ -1,6 +1,3 @@
-/** @file pl_trigger.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/pl_vert_trk.C b/macro/tof/beamtime/pl_vert_trk.C
index c34398e843..dd73207fd8 100644
--- a/macro/tof/beamtime/pl_vert_trk.C
+++ b/macro/tof/beamtime/pl_vert_trk.C
@@ -1,6 +1,3 @@
-/** @file pl_vert_trk.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_vert_trk()
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/save_hst.C b/macro/tof/beamtime/save_hst.C
index 96c9d20fd2..bf8830f302 100644
--- a/macro/tof/beamtime/save_hst.C
+++ b/macro/tof/beamtime/save_hst.C
@@ -1,6 +1,3 @@
-/** @file save_hst.C
-  * @copyright Copyright (C) 2016-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void save_hst(TString cstr = "hst/default.hst.root")
 {
   TIter next(gDirectory->GetList());
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C
index 2859b4883a..f3c23c7cd5 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Fri10Day.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0811_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0811_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0811_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C
index 5983ef67ba..b39c5bda97 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Fri10Late.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri1906_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri1906_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri1906_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C
index 9b7166dfa9..e9408dabfb 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Fri10Night.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0028_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0036_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0036_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C
index 00b1e0dba6..ace5423d09 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Mon13Night.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbMon0020_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbMon0100_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbMon0100_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C
index 4b870e8673..d35bff49fe 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Sat11Late.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat1630_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat1630_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat1630_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C
index 791d214b5b..ee802902aa 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Sat11Night.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat0011_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat0011_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat0011_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C
index ece2a3d745..d47a163991 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Sun12Day.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0900_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0900_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0900_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C
index 051b59c487..f38d30301f 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Sun12Late.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun1630_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun1630_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun1630_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C
index b99caa063e..1dcf8bc51a 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Sun12Night.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0125_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0133_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0142_0000.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C b/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C
index c300f2bb4e..c32341749c 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C
@@ -1,6 +1,3 @@
-/** @file AddFileGsi_Thu09Test.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbThu1715_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbThu1715_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbThu1715_0002.lmd");
diff --git a/macro/tof/beamtime/sep14/ana_digi.C b/macro/tof/beamtime/sep14/ana_digi.C
index 0ec5fa9a57..60d3f2c9fc 100644
--- a/macro/tof/beamtime/sep14/ana_digi.C
+++ b/macro/tof/beamtime/sep14/ana_digi.C
@@ -1,6 +1,3 @@
-/** @file ana_digi.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 5ed0714682..909d364930 100644
--- a/macro/tof/beamtime/sep14/ana_digi3.C
+++ b/macro/tof/beamtime/sep14/ana_digi3.C
@@ -1,6 +1,3 @@
-/** @file ana_digi3.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 08bf99b1bb..7b3f06b74e 100644
--- a/macro/tof/beamtime/sep14/ana_digi_cal.C
+++ b/macro/tof/beamtime/sep14/ana_digi_cal.C
@@ -1,6 +1,3 @@
-/** @file ana_digi_cal.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 b4b2e99fdd..5946b96b5f 100644
--- a/macro/tof/beamtime/sep14/ana_hits.C
+++ b/macro/tof/beamtime/sep14/ana_hits.C
@@ -1,6 +1,3 @@
-/** @file ana_hits.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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/pl_all_CluMul.C b/macro/tof/beamtime/sep14/pl_all_CluMul.C
index 7ee2e2d651..cf7bf49e3e 100644
--- a/macro/tof/beamtime/sep14/pl_all_CluMul.C
+++ b/macro/tof/beamtime/sep14/pl_all_CluMul.C
@@ -1,6 +1,3 @@
-/** @file pl_all_CluMul.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_CluMul(Int_t iNDet = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_DigiCor.C b/macro/tof/beamtime/sep14/pl_all_DigiCor.C
index d7200b2f62..d89817d6fb 100644
--- a/macro/tof/beamtime/sep14/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/sep14/pl_all_DigiCor.C
@@ -1,6 +1,3 @@
-/** @file pl_all_DigiCor.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_DigiCor(Int_t iNDet = 6)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_XY.C b/macro/tof/beamtime/sep14/pl_all_XY.C
index 730ddf7601..512d55ba75 100644
--- a/macro/tof/beamtime/sep14/pl_all_XY.C
+++ b/macro/tof/beamtime/sep14/pl_all_XY.C
@@ -1,6 +1,3 @@
-/** @file pl_all_XY.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_XY(Int_t iNDet = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C b/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C
index 6a3f74a50e..717bf3b6e4 100644
--- a/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C
+++ b/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluDelTofSel.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluDelTofSel(Int_t iNch = 1, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_cluWalk.C b/macro/tof/beamtime/sep14/pl_all_cluWalk.C
index 81ccf7b5f8..5258698140 100644
--- a/macro/tof/beamtime/sep14/pl_all_cluWalk.C
+++ b/macro/tof/beamtime/sep14/pl_all_cluWalk.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalk.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C b/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C
index c3a7c205ab..699a947cba 100644
--- a/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C
+++ b/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_cluWalkSel.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_dTSel.C b/macro/tof/beamtime/sep14/pl_all_dTSel.C
index c89858b925..28ad06aefa 100644
--- a/macro/tof/beamtime/sep14/pl_all_dTSel.C
+++ b/macro/tof/beamtime/sep14/pl_all_dTSel.C
@@ -1,6 +1,3 @@
-/** @file pl_all_dTSel.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_dTSel(Int_t iNSel = 4)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_time_resolution.C b/macro/tof/beamtime/sep14/pl_all_time_resolution.C
index bf2b69172c..a13fa3eb55 100644
--- a/macro/tof/beamtime/sep14/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/sep14/pl_all_time_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_all_time_resolution.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_time_resolution(UInt_t uTdcNumber1, UInt_t uTdcNumber2)
 {
   Int_t const kTdcChNb = 16;
diff --git a/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C b/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C
index cdd4d83234..f52ddb5576 100644
--- a/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trb_evtsize.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc.C b/macro/tof/beamtime/sep14/pl_all_trbtdc.C
index 1781f8990a..2849872cd1 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
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 e62270c88c..d232607aac 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_proc_status.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C b/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C
index bf6ee01746..0826c49761 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_refs.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C b/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C
index bae08aa775..aeca9a8058 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C
@@ -1,6 +1,3 @@
-/** @file pl_all_trbtdc_words.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_diam_tres.C b/macro/tof/beamtime/sep14/pl_diam_tres.C
index 1e810c7b76..0f5a1bbdaa 100644
--- a/macro/tof/beamtime/sep14/pl_diam_tres.C
+++ b/macro/tof/beamtime/sep14/pl_diam_tres.C
@@ -1,6 +1,3 @@
-/** @file pl_diam_tres.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_diam_tres(UInt_t uTdcNumber1 = 32, UInt_t uTdcNumber2 = 33)
 {
   const Int_t kiNbCh = 16;
diff --git a/macro/tof/beamtime/sep14/pl_info_2D.C b/macro/tof/beamtime/sep14/pl_info_2D.C
index 5ce3968f24..9f7124c599 100644
--- a/macro/tof/beamtime/sep14/pl_info_2D.C
+++ b/macro/tof/beamtime/sep14/pl_info_2D.C
@@ -1,6 +1,3 @@
-/** @file pl_info_2D.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_2D(char* cHist = "hDTD4DT04D4best", Int_t iDBin = 1, Int_t iMode = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_info_Chi2D.C b/macro/tof/beamtime/sep14/pl_info_Chi2D.C
index b850529f2e..f098507b25 100644
--- a/macro/tof/beamtime/sep14/pl_info_Chi2D.C
+++ b/macro/tof/beamtime/sep14/pl_info_Chi2D.C
@@ -1,6 +1,3 @@
-/** @file pl_info_Chi2D.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_info_Chi2D(char* cHist = "hChiDT04D4best", Int_t iDBin = 1)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C b/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C
index 5f0281fc28..0418ac2756 100644
--- a/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C
+++ b/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_info_Mat04D4best.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_map_debug.C b/macro/tof/beamtime/sep14/pl_map_debug.C
index 6ab26e7cc8..053e99bf14 100644
--- a/macro/tof/beamtime/sep14/pl_map_debug.C
+++ b/macro/tof/beamtime/sep14/pl_map_debug.C
@@ -1,6 +1,4 @@
-/** @file pl_map_debug.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_map_debug(Int_t iFirstTdc = 30, Int_t iSecondTdc = 30)
 {
   // constants
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04.C b/macro/tof/beamtime/sep14/pl_over_Mat04.C
index bd25179a8f..6416c2bc2c 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C b/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C
index ead8cc090d..ac5bdf67ed 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4best.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C b/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C
index c70325ee4c..a3ab75f1d5 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04D4sbest.C
-  * @copyright Copyright (C) 2015 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_Mat04D4sbest(Int_t iLog = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04best.C b/macro/tof/beamtime/sep14/pl_over_Mat04best.C
index 336ddb3560..3a2cc8a6ff 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04best.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat04best.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat24.C b/macro/tof/beamtime/sep14/pl_over_Mat24.C
index 8ceb0005b1..d4bf23cd52 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat24.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat24.C
@@ -1,6 +1,3 @@
-/** @file pl_over_Mat24.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_MatD4sel.C b/macro/tof/beamtime/sep14/pl_over_MatD4sel.C
index ce95c5cff2..5d0a87c5cc 100644
--- a/macro/tof/beamtime/sep14/pl_over_MatD4sel.C
+++ b/macro/tof/beamtime/sep14/pl_over_MatD4sel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_MatD4sel.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_XX.C b/macro/tof/beamtime/sep14/pl_over_XX.C
index 678002e354..4a851f2a81 100644
--- a/macro/tof/beamtime/sep14/pl_over_XX.C
+++ b/macro/tof/beamtime/sep14/pl_over_XX.C
@@ -1,6 +1,3 @@
-/** @file pl_over_XX.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_cl2g.C b/macro/tof/beamtime/sep14/pl_over_cl2g.C
index cea14cb79d..54153d3d6d 100644
--- a/macro/tof/beamtime/sep14/pl_over_cl2g.C
+++ b/macro/tof/beamtime/sep14/pl_over_cl2g.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cl2g.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu.C b/macro/tof/beamtime/sep14/pl_over_clu.C
index fbbef72f82..5d94f78bf4 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu0.C b/macro/tof/beamtime/sep14/pl_over_clu0.C
index 2625ce05c3..f595acb4c1 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu0T0.C b/macro/tof/beamtime/sep14/pl_over_clu0T0.C
index 9b0d216954..c480e0702f 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu0T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu0T0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu1.C b/macro/tof/beamtime/sep14/pl_over_clu1.C
index 50f3b550ac..0d30825ece 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu1.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu1.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu1.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2.C b/macro/tof/beamtime/sep14/pl_over_clu2.C
index 664695a488..7e6ae43443 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2T.C b/macro/tof/beamtime/sep14/pl_over_clu2T.C
index f11f74a0ce..548655afe8 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2T.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2T.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2T0.C b/macro/tof/beamtime/sep14/pl_over_clu2T0.C
index 3b194cfb31..548655afe8 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2T0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2trg0.C b/macro/tof/beamtime/sep14/pl_over_clu2trg0.C
index f54d642019..829d747e11 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2trg0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu2trg0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu4.C b/macro/tof/beamtime/sep14/pl_over_clu4.C
index 03256cb5ee..5f964e9f73 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu4.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu4.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu4.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu4T0.C b/macro/tof/beamtime/sep14/pl_over_clu4T0.C
index 1af005d4bd..6d3afd7919 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu4T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu4T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu4T0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu5.C b/macro/tof/beamtime/sep14/pl_over_clu5.C
index c83b21c857..743a7bea2e 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu5.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu5.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu5.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu6.C b/macro/tof/beamtime/sep14/pl_over_clu6.C
index f8ca44dea7..0bcc770ca1 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu6.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu6.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu6.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu7.C b/macro/tof/beamtime/sep14/pl_over_clu7.C
index 3b37601b0b..8dad0767b7 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu7.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu7.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu7.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu7T0.C b/macro/tof/beamtime/sep14/pl_over_clu7T0.C
index ff582d16df..c3e5d85c12 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu7T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu7T0.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu7T0.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_clu8.C b/macro/tof/beamtime/sep14/pl_over_clu8.C
index 75e4a2c582..1d90c415ac 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu8.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu8.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clu8.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_cluSel.C b/macro/tof/beamtime/sep14/pl_over_cluSel.C
index 62e1b3dd06..0af22392ee 100644
--- a/macro/tof/beamtime/sep14/pl_over_cluSel.C
+++ b/macro/tof/beamtime/sep14/pl_over_cluSel.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cluSel.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clust.C b/macro/tof/beamtime/sep14/pl_over_clust.C
index 6b3779083c..179ce00364 100644
--- a/macro/tof/beamtime/sep14/pl_over_clust.C
+++ b/macro/tof/beamtime/sep14/pl_over_clust.C
@@ -1,6 +1,3 @@
-/** @file pl_over_clust.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_cor.C b/macro/tof/beamtime/sep14/pl_over_cor.C
index b8be14419d..3f827a633d 100644
--- a/macro/tof/beamtime/sep14/pl_over_cor.C
+++ b/macro/tof/beamtime/sep14/pl_over_cor.C
@@ -1,6 +1,3 @@
-/** @file pl_over_cor.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_cor(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_pla.C b/macro/tof/beamtime/sep14/pl_over_pla.C
index 79e5ed9d90..0280a91d9a 100644
--- a/macro/tof/beamtime/sep14/pl_over_pla.C
+++ b/macro/tof/beamtime/sep14/pl_over_pla.C
@@ -1,6 +1,3 @@
-/** @file pl_over_pla.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
diff --git a/macro/tof/beamtime/sep14/pl_over_trb_ct.C b/macro/tof/beamtime/sep14/pl_over_trb_ct.C
index f1f141385f..5cf941221e 100644
--- a/macro/tof/beamtime/sep14/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/sep14/pl_over_trb_ct.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ct.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_trb_ft.C b/macro/tof/beamtime/sep14/pl_over_trb_ft.C
index 7387b2fad5..6541d18f75 100644
--- a/macro/tof/beamtime/sep14/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/sep14/pl_over_trb_ft.C
@@ -1,6 +1,3 @@
-/** @file pl_over_trb_ft.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_vftx.C b/macro/tof/beamtime/sep14/pl_over_vftx.C
index c14828bd45..3a318b8546 100644
--- a/macro/tof/beamtime/sep14/pl_over_vftx.C
+++ b/macro/tof/beamtime/sep14/pl_over_vftx.C
@@ -1,6 +1,3 @@
-/** @file pl_over_vftx.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //  TCanvas *can = new TCanvas("can22","can22");
   //  can->Divide(2,2);
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 6f3deff570..b395202cce 100644
--- a/macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C
+++ b/macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C
@@ -1,6 +1,3 @@
-/** @file pl_pla_res_vs_tot.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 1e3fcc8a5d..8db2c8a629 100644
--- a/macro/tof/beamtime/sep14/pl_pla_resolution.C
+++ b/macro/tof/beamtime/sep14/pl_pla_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_pla_resolution.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 4dd3a8be7f..62cf972278 100644
--- a/macro/tof/beamtime/sep14/pl_tdc_ref_res.C
+++ b/macro/tof/beamtime/sep14/pl_tdc_ref_res.C
@@ -1,6 +1,4 @@
-/** @file pl_tdc_ref_res.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 void pl_tdc_ref_res(Int_t fNumberOfTDC = 34)
 {
   // Monitoring of the TDc resolution stability using reference channel
diff --git a/macro/tof/beamtime/sep14/pl_time_resolution.C b/macro/tof/beamtime/sep14/pl_time_resolution.C
index 23176a7fec..9a7c41bcf4 100644
--- a/macro/tof/beamtime/sep14/pl_time_resolution.C
+++ b/macro/tof/beamtime/sep14/pl_time_resolution.C
@@ -1,8 +1,6 @@
-/** @file pl_time_resolution.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_time_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2)
 {
+
   delete gROOT->FindObjectAny("tHistogram");
 
   FairRootManager* tManager = FairRootManager::Instance();
diff --git a/macro/tof/beamtime/sep14/pl_tot_per_channel.C b/macro/tof/beamtime/sep14/pl_tot_per_channel.C
index 1c40be9673..713971c1e9 100644
--- a/macro/tof/beamtime/sep14/pl_tot_per_channel.C
+++ b/macro/tof/beamtime/sep14/pl_tot_per_channel.C
@@ -1,6 +1,3 @@
-/** @file pl_tot_per_channel.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_tot_per_channel(UInt_t uTdcNumber)
 {
   Int_t const kTdcChNb = 16;
diff --git a/macro/tof/beamtime/thuqa/basic_unpacking.C b/macro/tof/beamtime/thuqa/basic_unpacking.C
index c2af9062dc..2544b0632f 100644
--- a/macro/tof/beamtime/thuqa/basic_unpacking.C
+++ b/macro/tof/beamtime/thuqa/basic_unpacking.C
@@ -1,6 +1,3 @@
-/** @file basic_unpacking.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C
index 579fcb45fc..84c512bbeb 100644
--- a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C
+++ b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C
@@ -1,6 +1,5 @@
-/** @file pl_TdcChannelCoincidences.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void pl_TdcChannelCoincidences(
   const TString& sTreeFile = "unpack_CbmTofQa_28May1635_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root",
   bool usePlaMultEvents    = 1)
diff --git a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C
index ef4663d422..288e085430 100644
--- a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C
+++ b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C
@@ -1,6 +1,5 @@
-/** @file pl_TdcChannelCoincidencesNoCalib.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void pl_TdcChannelCoincidencesNoCalib(
   const TString& sTreeFile = "unpack_CbmTofQa_28May1635_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root")
 {
diff --git a/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C b/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C
index c987ffd61f..2f10604c14 100644
--- a/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C
+++ b/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C
@@ -1,6 +1,5 @@
-/** @file pl_TdcPlaCheck0703.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 void pl_TdcPlaCheck0703(
   const TString& sTreeFile = "unpack_CbmTofQa_02Jul1721_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root")
 {
diff --git a/macro/tof/beamtime/thuqa/pl_all_time_resolution.C b/macro/tof/beamtime/thuqa/pl_all_time_resolution.C
index 884cde92c6..414d1bdf98 100644
--- a/macro/tof/beamtime/thuqa/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/thuqa/pl_all_time_resolution.C
@@ -1,6 +1,3 @@
-/** @file pl_all_time_resolution.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_all_time_resolution(
   UInt_t uTdcNumber1, UInt_t uTdcNumber2,
   const TString& sTreeFile = "unpack_CbmTofQa_05Jun1043_mrpc1_000_mrpc2_200_mrpc3_200_nb.out.root",
diff --git a/macro/tof/beamtime/unpack_run36_Fair.C b/macro/tof/beamtime/unpack_run36_Fair.C
index 7b26b2f801..99a3d88701 100644
--- a/macro/tof/beamtime/unpack_run36_Fair.C
+++ b/macro/tof/beamtime/unpack_run36_Fair.C
@@ -1,6 +1,3 @@
-/** @file unpack_run36_Fair.C
-  * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/tof/deb/global_phys.C b/macro/tof/deb/global_phys.C
index 8b5f8f5629..35f956285c 100644
--- a/macro/tof/deb/global_phys.C
+++ b/macro/tof/deb/global_phys.C
@@ -1,6 +1,3 @@
-/** @file global_phys.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void global_phys(Int_t nEvents = 10, Int_t seed = 555)
 {
   gRandom->SetSeed(seed);
diff --git a/macro/tof/deb/tof_Ana100p.C b/macro/tof/deb/tof_Ana100p.C
index fab49640b0..090fde0b8a 100644
--- a/macro/tof/deb/tof_Ana100p.C
+++ b/macro/tof/deb/tof_Ana100p.C
@@ -1,8 +1,6 @@
-/** @file tof_Ana100p.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 tof_Ana100p(Int_t nEvents = 1000, Int_t iout = 1)
 {
+
   TString InputFile = "data/auaumbias.mc.root";
   TString ParFile   = "data/auaumbias.params.root";
 
diff --git a/macro/tof/deb/tof_Ana104.C b/macro/tof/deb/tof_Ana104.C
index df92a57220..40f252f087 100644
--- a/macro/tof/deb/tof_Ana104.C
+++ b/macro/tof/deb/tof_Ana104.C
@@ -1,8 +1,6 @@
-/** @file tof_Ana104.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 tof_Ana104(Int_t nEvents = 1000, Int_t iout = 1)
 {
+
   TString InputFile = "data/auaumbias4.mc.root";
   TString ParFile   = "data/auaumbias4.params.root";
 
diff --git a/macro/tof/deb/tof_Ana300.C b/macro/tof/deb/tof_Ana300.C
index c838e311cc..7c3884fc3b 100644
--- a/macro/tof/deb/tof_Ana300.C
+++ b/macro/tof/deb/tof_Ana300.C
@@ -1,8 +1,6 @@
-/** @file tof_Ana300.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 tof_Ana300(Int_t nEvents = 1000, Int_t iout = 0)
 {
+
   TString InputFile = "data/mc.0000.root";
   TString ParFile   = "data/param.0000.root";
 
diff --git a/macro/tof/deb/tof_Ana_100.C b/macro/tof/deb/tof_Ana_100.C
index 4c07910005..ab497e8b9e 100644
--- a/macro/tof/deb/tof_Ana_100.C
+++ b/macro/tof/deb/tof_Ana_100.C
@@ -1,8 +1,6 @@
-/** @file tof_Ana_100.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 tof_Ana_100(Int_t nEvents = 1000, Int_t iout = 1)
 {
+
   TString InputFile = "data/auaumbias.mc.root";
   TString ParFile   = "data/auaumbias.params.root";
 
diff --git a/macro/tof/deb/tof_ana100.C b/macro/tof/deb/tof_ana100.C
index a6f1976785..c9db7ed6e6 100644
--- a/macro/tof/deb/tof_ana100.C
+++ b/macro/tof/deb/tof_ana100.C
@@ -1,8 +1,6 @@
-/** @file tof_ana100.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 tof_ana100(Int_t nEvents = 1000, Int_t iout = 1)
 {
+
   TString InputFile = "data/auaumbias.mc.root";
   TString ParFile   = "data/auaumbias.params.root";
 
diff --git a/macro/tof/deb/tof_deb100.C b/macro/tof/deb/tof_deb100.C
index 1985aa19d1..0c76360087 100644
--- a/macro/tof/deb/tof_deb100.C
+++ b/macro/tof/deb/tof_deb100.C
@@ -1,8 +1,6 @@
-/** @file tof_deb100.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 tof_deb100(Int_t nEvents = 1000, Int_t iout = 1)
 {
+
   TString InputFile = "data/auaumbias.mc.root";
   TString ParFile   = "data/auaumbias.params.root";
 
diff --git a/macro/tof/deb/tof_reco100.C b/macro/tof/deb/tof_reco100.C
index 4cb4f840b1..4e7152428a 100644
--- a/macro/tof/deb/tof_reco100.C
+++ b/macro/tof/deb/tof_reco100.C
@@ -1,6 +1,3 @@
-/** @file tof_reco100.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/deb/tof_reco100box.C b/macro/tof/deb/tof_reco100box.C
index fe022edd0a..66c770b49a 100644
--- a/macro/tof/deb/tof_reco100box.C
+++ b/macro/tof/deb/tof_reco100box.C
@@ -1,6 +1,3 @@
-/** @file tof_reco100box.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/deb/tof_reco100p.C b/macro/tof/deb/tof_reco100p.C
index 1e27f6f3b2..6e2854d6b2 100644
--- a/macro/tof/deb/tof_reco100p.C
+++ b/macro/tof/deb/tof_reco100p.C
@@ -1,6 +1,3 @@
-/** @file tof_reco100p.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/deb/tof_reco104.C b/macro/tof/deb/tof_reco104.C
index dadad02103..70abf010b5 100644
--- a/macro/tof/deb/tof_reco104.C
+++ b/macro/tof/deb/tof_reco104.C
@@ -1,6 +1,3 @@
-/** @file tof_reco104.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/deb/tof_reco300.C b/macro/tof/deb/tof_reco300.C
index 17a104f978..0166064684 100644
--- a/macro/tof/deb/tof_reco300.C
+++ b/macro/tof/deb/tof_reco300.C
@@ -1,6 +1,3 @@
-/** @file tof_reco300.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/deb/tof_sim100box.C b/macro/tof/deb/tof_sim100box.C
index e4d90bf735..786a911617 100644
--- a/macro/tof/deb/tof_sim100box.C
+++ b/macro/tof/deb/tof_sim100box.C
@@ -1,6 +1,3 @@
-/** @file tof_sim100box.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/deb/tof_sim100p.C b/macro/tof/deb/tof_sim100p.C
index 5b9153dbd5..c2f2bd4c72 100644
--- a/macro/tof/deb/tof_sim100p.C
+++ b/macro/tof/deb/tof_sim100p.C
@@ -1,6 +1,3 @@
-/** @file tof_sim100p.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/deb/tof_sim104.C b/macro/tof/deb/tof_sim104.C
index c585224cd5..9793c044a0 100644
--- a/macro/tof/deb/tof_sim104.C
+++ b/macro/tof/deb/tof_sim104.C
@@ -1,6 +1,3 @@
-/** @file tof_sim104.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/digitizer/GenTofBdfRootInput_v17a.C b/macro/tof/digitizer/GenTofBdfRootInput_v17a.C
index c6b86a5d66..05eab0fbe5 100644
--- a/macro/tof/digitizer/GenTofBdfRootInput_v17a.C
+++ b/macro/tof/digitizer/GenTofBdfRootInput_v17a.C
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * GenTofBdfRootInput_v17a.C
  * p.-a Loizeau, GSI, 09/05/2017
diff --git a/macro/tof/digitizer/run_digi.C b/macro/tof/digitizer/run_digi.C
index fb7d47857e..a600e0335d 100644
--- a/macro/tof/digitizer/run_digi.C
+++ b/macro/tof/digitizer/run_digi.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for TOF digitzer testing
diff --git a/macro/tof/digitizer/run_digi_test.C b/macro/tof/digitizer/run_digi_test.C
index cca45c8f6b..f26ad0123c 100644
--- a/macro/tof/digitizer/run_digi_test.C
+++ b/macro/tof/digitizer/run_digi_test.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for TOF digitzer testing
diff --git a/macro/tof/digitizer/run_reco.C b/macro/tof/digitizer/run_reco.C
index 6f16f405d2..af86ff251a 100644
--- a/macro/tof/digitizer/run_reco.C
+++ b/macro/tof/digitizer/run_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/tof/digitizer/run_reco100.C b/macro/tof/digitizer/run_reco100.C
index 75113f8429..9efe0615c0 100644
--- a/macro/tof/digitizer/run_reco100.C
+++ b/macro/tof/digitizer/run_reco100.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/tof/digitizer/run_tof_disim.C b/macro/tof/digitizer/run_tof_disim.C
index 7f2b8f5706..ab93612360 100644
--- a/macro/tof/digitizer/run_tof_disim.C
+++ b/macro/tof/digitizer/run_tof_disim.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/eventDisplay100.C b/macro/tof/eventDisplay100.C
index 19f0dd4144..62c44edfae 100644
--- a/macro/tof/eventDisplay100.C
+++ b/macro/tof/eventDisplay100.C
@@ -1,8 +1,6 @@
-/** @file eventDisplay100.C
-  * @copyright Copyright (C) 2012-2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 eventDisplay100()
 {
+
   TString InputFile = "data/auaumbias.root";
   TString ParFile   = "data/params.root";
 
diff --git a/macro/tof/eventDisplay_1p.C b/macro/tof/eventDisplay_1p.C
index bcb1f0d60d..8d9b96b020 100644
--- a/macro/tof/eventDisplay_1p.C
+++ b/macro/tof/eventDisplay_1p.C
@@ -1,6 +1,3 @@
-/** @file eventDisplay_1p.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 eventDisplay_1p(Int_t iTrackingSetup = 1, Int_t iSys = 0, Int_t iSel = 1, Int_t iSel2 = -3)
 {
   switch (iSys) {
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v12a.C b/macro/tof/geometry/Create_TOF_Geometry_v12a.C
index bfd01ff96c..5f059eac28 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v12a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v12a.C
@@ -1,7 +1,5 @@
-/** @file Create_TOF_Geometry_v12a.C
-  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // in root all sizes are given in cm
+
 #include "TFile.h"
 #include "TGeoCompositeShape.h"
 #include "TGeoManager.h"
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C b/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C
index 31010ea235..2b1e4a836b 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C
@@ -1,7 +1,5 @@
-/** @file Create_TOF_Geometry_v13_3a.C
-  * @copyright Copyright (C) 2013-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // in root all sizes are given in cm
+
 #include "TFile.h"
 #include "TGeoCompositeShape.h"
 #include "TGeoManager.h"
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C b/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C
index 1649a6edda..0a59b6a806 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C
@@ -1,7 +1,5 @@
-/** @file Create_TOF_Geometry_v13_3b.C
-  * @copyright Copyright (C) 2013-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // in root all sizes are given in cm
+
 #include "TFile.h"
 #include "TGeoCompositeShape.h"
 #include "TGeoManager.h"
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C b/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C
index 5c32d563f9..5d36f1716f 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C b/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C
index efd0eb2e15..9451a84544 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14_0.C b/macro/tof/geometry/Create_TOF_Geometry_v14_0.C
index 45bf9c4851..8c402e4cdd 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14_0.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14_0.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v14_0.C
-  * @copyright Copyright (C) 2014-2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14a.C b/macro/tof/geometry/Create_TOF_Geometry_v14a.C
index 1efd4c5b78..2c97f8ceb1 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14a.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v14a.C
-  * @copyright Copyright (C) 2015-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14b.C b/macro/tof/geometry/Create_TOF_Geometry_v14b.C
index cb77be1578..b5b085adee 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14b.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v14b.C
-  * @copyright Copyright (C) 2015-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14c.C b/macro/tof/geometry/Create_TOF_Geometry_v14c.C
index d47bfe0134..51a7ad55d8 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14c.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v14c.C
-  * @copyright Copyright (C) 2015-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v14c - Cern Feb 15, compact version
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15a.C b/macro/tof/geometry/Create_TOF_Geometry_v15a.C
index 4b3519fd1b..39adae19a7 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15a.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v15a.C
-  * @copyright Copyright (C) 2015-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v15a - Cern Feb 15, (before moving) compact version
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15b.C b/macro/tof/geometry/Create_TOF_Geometry_v15b.C
index 0ffd0ee028..c9158811e0 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15b.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v15b.C
-  * @copyright Copyright (C) 2015-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v14c - Cern Feb 15, compact version
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15c.C b/macro/tof/geometry/Create_TOF_Geometry_v15c.C
index 9837c14e40..455b694117 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15c.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v15c.C
-  * @copyright Copyright (C) 2015-2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v15c - Cern Nov 15, initial version
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15d.C b/macro/tof/geometry/Create_TOF_Geometry_v15d.C
index 92158d2260..4008549e57 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15d.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15d.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v15d.C
-  * @copyright Copyright (C) 2016-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for cosmic setup: v15d
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16a.C b/macro/tof/geometry/Create_TOF_Geometry_v16a.C
index c276765870..dd78fe075a 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16a.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16b.C b/macro/tof/geometry/Create_TOF_Geometry_v16b.C
index 24d941db90..beaa88d419 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16b.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v16b.C
-  * @copyright Copyright (C) 2016-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v16b - Cern Nov 2016, initial version
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16c.C b/macro/tof/geometry/Create_TOF_Geometry_v16c.C
index 7ce0544946..a45e3d0850 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16c.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16d.C b/macro/tof/geometry/Create_TOF_Geometry_v16d.C
index 5c46b9d12b..46d2d70b04 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16d.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16d.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v16d.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16e.C b/macro/tof/geometry/Create_TOF_Geometry_v16e.C
index 50a68b3cb3..58320537e0 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16e.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16e.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v16e.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v17a.C b/macro/tof/geometry/Create_TOF_Geometry_v17a.C
index 3d1f8923ff..7b4fb6b1b3 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v17a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v17a.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v17a.C
-  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v17b.C b/macro/tof/geometry/Create_TOF_Geometry_v17b.C
index dd5dc71e35..c69812555c 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v17b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v17b.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v17b.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v17b - Heidelberg Cosmic April 2017, initial version
 //
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v17c.C b/macro/tof/geometry/Create_TOF_Geometry_v17c.C
index b3bc53e46b..62d3417d39 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v17c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v17c.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C b/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C
index fd37237c92..f145264644 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18j_cosmicHD.C
-  * @copyright Copyright (C) 2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18h_mcbm.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C b/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C
index a5be0fd16d..08f7aaf008 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18l_mCbm.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18k_mCbm.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C b/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C
index c1b2828d2d..daec7fbce7 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18m_mCbm.C
-  * @copyright Copyright (C) 2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TOF_Geometry_v18k_mCbm.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18p.C b/macro/tof/geometry/Create_TOF_Geometry_v18p.C
index 8b6809a646..ebad146dbf 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18p.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18p.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_v18p.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v18a - Heidelberg Cosmic December 2017, 1 real STAR module
 // Ingo Deppner
 // Usage:
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v20a.C b/macro/tof/geometry/Create_TOF_Geometry_v20a.C
index ea22f7ba83..cd931b7309 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v20a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v20a.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TOF_Geometry_v13_4x.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 28b5f22ed5..3df24fab64 100644
--- a/macro/tof/geometry/TOF_test.C
+++ b/macro/tof/geometry/TOF_test.C
@@ -1,6 +1,3 @@
-/** @file TOF_test.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //Generator for CbmTof Geometry
 //Update 01/10/2012 nh
 // 08/10/2012 add sensitive gas gaps
diff --git a/macro/tof/geometry/make_geofile.C b/macro/tof/geometry/make_geofile.C
index 8df18524d5..17c7f92cb5 100644
--- a/macro/tof/geometry/make_geofile.C
+++ b/macro/tof/geometry/make_geofile.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/geometry/make_geofile_noBfield.C b/macro/tof/geometry/make_geofile_noBfield.C
index 4b64ba8283..14062d67fd 100644
--- a/macro/tof/geometry/make_geofile_noBfield.C
+++ b/macro/tof/geometry/make_geofile_noBfield.C
@@ -1,6 +1,3 @@
-/** @file make_geofile_noBfield.C
-  * @copyright Copyright (C) 2016-2019 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
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 2022c70a46..9ef36c7328 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_Star_1.C
-  * @copyright Copyright (C) 2016-2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for STAR wheel
 //
 // Usage:
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 bccdc26b4e..a477ab3295 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_Star_2.C
-  * @copyright Copyright (C) 2017 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for STAR wheel within FAIRROOT
 //
 // Usage:
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 0030a6b83b..e81a9c311a 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,6 +1,3 @@
-/** @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 **/
 // Macro creating a ToF geometry for test beam: v18a - Heidelberg Cosmic December 2017, 1 real STAR module
 // Ingo Deppner
 // Usage:
diff --git a/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C b/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C
index 62778802af..8eb2b434cd 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C
@@ -1,6 +1,3 @@
-/** @file Create_TOF_Geometry_vSTAR17a.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro creating a ToF geometry for test beam: v16b - Cern Nov 2016, initial version
 //
 // Usage:
diff --git a/macro/tof/pl_lambda.C b/macro/tof/pl_lambda.C
index 03529bed58..51b6777194 100644
--- a/macro/tof/pl_lambda.C
+++ b/macro/tof/pl_lambda.C
@@ -1,6 +1,3 @@
-/** @file pl_lambda.C
-  * @copyright Copyright (C) 2018 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void pl_lambda(Double_t sf = 0.)
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/qa/GeomHitMapComp.C b/macro/tof/qa/GeomHitMapComp.C
index c0837ef589..7b0a11a609 100644
--- a/macro/tof/qa/GeomHitMapComp.C
+++ b/macro/tof/qa/GeomHitMapComp.C
@@ -1,6 +1,5 @@
-/** @file GeomHitMapComp.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
+
 Bool_t GeomHitMapComp()
 {
 
diff --git a/macro/tof/qa/data/MultiPntDeltaYClosest.C b/macro/tof/qa/data/MultiPntDeltaYClosest.C
index 2de720a70c..b89aec2dea 100644
--- a/macro/tof/qa/data/MultiPntDeltaYClosest.C
+++ b/macro/tof/qa/data/MultiPntDeltaYClosest.C
@@ -1,6 +1,3 @@
-/** @file MultiPntDeltaYClosest.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //=========Macro generated from canvas: Panel1/
   //=========  (Tue Sep 29 13:53:52 2015) by ROOT version5.34/32
diff --git a/macro/tof/qa/data/MultiPntDeltaYMean.C b/macro/tof/qa/data/MultiPntDeltaYMean.C
index 8b9ee3fdf4..3d9727b7d2 100644
--- a/macro/tof/qa/data/MultiPntDeltaYMean.C
+++ b/macro/tof/qa/data/MultiPntDeltaYMean.C
@@ -1,6 +1,3 @@
-/** @file MultiPntDeltaYMean.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //=========Macro generated from canvas: Panel2/
   //=========  (Tue Sep 29 13:54:31 2015) by ROOT version5.34/32
diff --git a/macro/tof/qa/data/MultiTrkDeltaYClosest.C b/macro/tof/qa/data/MultiTrkDeltaYClosest.C
index 3f71d06eac..5d94c165cd 100644
--- a/macro/tof/qa/data/MultiTrkDeltaYClosest.C
+++ b/macro/tof/qa/data/MultiTrkDeltaYClosest.C
@@ -1,6 +1,3 @@
-/** @file MultiTrkDeltaYClosest.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //=========Macro generated from canvas: Panel1/
   //=========  (Tue Sep 29 13:57:45 2015) by ROOT version5.34/32
diff --git a/macro/tof/qa/data/MultiTrkDeltaYMean.C b/macro/tof/qa/data/MultiTrkDeltaYMean.C
index 19cc6532fc..7e62ec1a31 100644
--- a/macro/tof/qa/data/MultiTrkDeltaYMean.C
+++ b/macro/tof/qa/data/MultiTrkDeltaYMean.C
@@ -1,6 +1,3 @@
-/** @file MultiTrkDeltaYMean.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //=========Macro generated from canvas: Panel1/
   //=========  (Tue Sep 29 13:58:32 2015) by ROOT version5.34/32
diff --git a/macro/tof/qa/data/SingTrkDeltaY.C b/macro/tof/qa/data/SingTrkDeltaY.C
index fa0028c51e..25b91ab14b 100644
--- a/macro/tof/qa/data/SingTrkDeltaY.C
+++ b/macro/tof/qa/data/SingTrkDeltaY.C
@@ -1,6 +1,3 @@
-/** @file SingTrkDeltaY.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //=========Macro generated from canvas: Panel1/
   //=========  (Tue Sep 29 14:12:56 2015) by ROOT version5.34/32
diff --git a/macro/tof/qa/data/SingTrkMultiPntDeltaY.C b/macro/tof/qa/data/SingTrkMultiPntDeltaY.C
index a2d873550b..42da9d466a 100644
--- a/macro/tof/qa/data/SingTrkMultiPntDeltaY.C
+++ b/macro/tof/qa/data/SingTrkMultiPntDeltaY.C
@@ -1,6 +1,3 @@
-/** @file SingTrkMultiPntDeltaY.C
-  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 {
   //=========Macro generated from canvas: Panel1/
   //=========  (Tue Sep 29 14:00:13 2015) by ROOT version5.34/32
diff --git a/macro/tof/qa/hitProdComp.C b/macro/tof/qa/hitProdComp.C
index 720a553859..a25cdc13fd 100644
--- a/macro/tof/qa/hitProdComp.C
+++ b/macro/tof/qa/hitProdComp.C
@@ -1,6 +1,3 @@
-/** @file hitProdComp.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R", "T"};
diff --git a/macro/tof/qa/hitProdCompPull.C b/macro/tof/qa/hitProdCompPull.C
index ac8ece72ea..24b4385ec4 100644
--- a/macro/tof/qa/hitProdCompPull.C
+++ b/macro/tof/qa/hitProdCompPull.C
@@ -1,6 +1,3 @@
-/** @file hitProdCompPull.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 4;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R"};
diff --git a/macro/tof/qa/hitProdDigiComp.C b/macro/tof/qa/hitProdDigiComp.C
index 929f1d87ee..4d2bab8854 100644
--- a/macro/tof/qa/hitProdDigiComp.C
+++ b/macro/tof/qa/hitProdDigiComp.C
@@ -1,6 +1,3 @@
-/** @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 **/
 const UInt_t kuNbHistos               = 5;
 const UInt_t kuNbDim                  = 5;
 const TString ksDimName[kuNbDim]      = {"X", "Y", "Z", "R", "T"};
diff --git a/macro/tof/qa/hitQualComp.C b/macro/tof/qa/hitQualComp.C
index fbcba43ad1..2653b5872c 100644
--- a/macro/tof/qa/hitQualComp.C
+++ b/macro/tof/qa/hitQualComp.C
@@ -1,6 +1,4 @@
-/** @file hitQualComp.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R", "T"};
diff --git a/macro/tof/qa/hitQualCompBest.C b/macro/tof/qa/hitQualCompBest.C
index f89799de82..3e63d1df39 100644
--- a/macro/tof/qa/hitQualCompBest.C
+++ b/macro/tof/qa/hitQualCompBest.C
@@ -1,6 +1,4 @@
-/** @file hitQualCompBest.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R", "T"};
diff --git a/macro/tof/qa/hitQualCompPull.C b/macro/tof/qa/hitQualCompPull.C
index 93019e5219..8faf1ba514 100644
--- a/macro/tof/qa/hitQualCompPull.C
+++ b/macro/tof/qa/hitQualCompPull.C
@@ -1,6 +1,4 @@
-/** @file hitQualCompPull.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 4;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R"};
diff --git a/macro/tof/qa/qaPlotsComp.C b/macro/tof/qa/qaPlotsComp.C
index 436d3e9c4e..4086336529 100644
--- a/macro/tof/qa/qaPlotsComp.C
+++ b/macro/tof/qa/qaPlotsComp.C
@@ -1,6 +1,3 @@
-/** @file qaPlotsComp.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 const UInt_t kuNbFiles               = 4;
 const Color_t kcFileColor[kuNbFiles] = {kBlue, kRed, kGreen, kOrange};
 const Int_t kiLineWidth              = 2;
diff --git a/macro/tof/qa/tof_hitMeanMc_eff.C b/macro/tof/qa/tof_hitMeanMc_eff.C
index 691ed7d231..2095b9161f 100644
--- a/macro/tof/qa/tof_hitMeanMc_eff.C
+++ b/macro/tof/qa/tof_hitMeanMc_eff.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 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 e830addd9d..87304e7329 100644
--- a/macro/tof/qa/tof_map_norm_gen_ana.C
+++ b/macro/tof/qa/tof_map_norm_gen_ana.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for TOF digitzer testing
diff --git a/macro/tof/qa/tof_map_norm_gen_mc.C b/macro/tof/qa/tof_map_norm_gen_mc.C
index 6686d18eec..23494a6ab7 100644
--- a/macro/tof/qa/tof_map_norm_gen_mc.C
+++ b/macro/tof/qa/tof_map_norm_gen_mc.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation with the TOF
diff --git a/macro/tof/qa/tof_qa_ana.C b/macro/tof/qa/tof_qa_ana.C
index cba95b0fee..3c00f2d798 100644
--- a/macro/tof/qa/tof_qa_ana.C
+++ b/macro/tof/qa/tof_qa_ana.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for TOF digitzer and clusterizer QA
diff --git a/macro/tof/qa/tof_qa_hp.C b/macro/tof/qa/tof_qa_hp.C
index 7fa12c3eb5..c7a6fb9634 100644
--- a/macro/tof/qa/tof_qa_hp.C
+++ b/macro/tof/qa/tof_qa_hp.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for TOF digitzer and clusterizer QA
diff --git a/macro/tof/qa/tof_qa_plot.C b/macro/tof/qa/tof_qa_plot.C
index 08d7d214f6..4cb9d50635 100644
--- a/macro/tof/qa/tof_qa_plot.C
+++ b/macro/tof/qa/tof_qa_plot.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 // Constants definitions: Particles list
 const Int_t kiNbPart              = 13;
 const TString ksPartTag[kiNbPart] = {"others", "ep", "em", "pip", "pim", "kp", "km", "p", "pbar", "d", "t", "he", "a"};
diff --git a/macro/tof/qa/tof_qa_sim.C b/macro/tof/qa/tof_qa_sim.C
index 99f494e5bf..8e813eb863 100644
--- a/macro/tof/qa/tof_qa_sim.C
+++ b/macro/tof/qa/tof_qa_sim.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/qa/trd_notrd_comp.C b/macro/tof/qa/trd_notrd_comp.C
index 54447dc1f9..c3107efe3f 100644
--- a/macro/tof/qa/trd_notrd_comp.C
+++ b/macro/tof/qa/trd_notrd_comp.C
@@ -1,6 +1,4 @@
-/** @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 **/
+
 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",
                       TString sOutFileTag    = "_cbm100_pbar_25gev")
diff --git a/macro/tof/qa/valGeomComp.C b/macro/tof/qa/valGeomComp.C
index af44341e38..92db283744 100644
--- a/macro/tof/qa/valGeomComp.C
+++ b/macro/tof/qa/valGeomComp.C
@@ -1,6 +1,4 @@
-/** @file valGeomComp.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R", "T"};
diff --git a/macro/tof/qa/valHpDigiComp.C b/macro/tof/qa/valHpDigiComp.C
index 45c093b709..e9acc0fe2c 100644
--- a/macro/tof/qa/valHpDigiComp.C
+++ b/macro/tof/qa/valHpDigiComp.C
@@ -1,6 +1,4 @@
-/** @file valHpDigiComp.C
-  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
 const TString ksDimName[kuNbDim]     = {"X", "Y", "Z", "R", "T"};
diff --git a/macro/tof/run100.C b/macro/tof/run100.C
index 2ea160b8a3..c4df01ddec 100644
--- a/macro/tof/run100.C
+++ b/macro/tof/run100.C
@@ -1,6 +1,3 @@
-/** @file run100.C
-  * @copyright Copyright (C) 2012 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 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 ddcc70f5ec..67e60a5f64 100644
--- a/macro/tof/run_reco100.C
+++ b/macro/tof/run_reco100.C
@@ -1,6 +1,3 @@
-/** @file run_reco100.C
-  * @copyright Copyright (C) 2012 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/tof/run_reco_TOF_QA.C b/macro/tof/run_reco_TOF_QA.C
index 987030d493..ad362ab618 100644
--- a/macro/tof/run_reco_TOF_QA.C
+++ b/macro/tof/run_reco_TOF_QA.C
@@ -1,6 +1,3 @@
-/** @file run_reco_TOF_QA.C
-  * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events
diff --git a/macro/tof/run_sim_TOF_QA.C b/macro/tof/run_sim_TOF_QA.C
index bde149b7d8..bb21af88d9 100644
--- a/macro/tof/run_sim_TOF_QA.C
+++ b/macro/tof/run_sim_TOF_QA.C
@@ -1,6 +1,3 @@
-/** @file run_sim_TOF_QA.C
-  * @copyright Copyright (C) 2007-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/tof_ana_Testbeam.C b/macro/tof/tof_ana_Testbeam.C
index 85ab2cebcd..fe941ed8e9 100644
--- a/macro/tof/tof_ana_Testbeam.C
+++ b/macro/tof/tof_ana_Testbeam.C
@@ -1,6 +1,3 @@
-/** @file tof_ana_Testbeam.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 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 5c201ec7cd..f2de0124c0 100644
--- a/macro/tof/tof_reco.C
+++ b/macro/tof/tof_reco.C
@@ -1,6 +1,3 @@
-/** @file tof_reco.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/tof_reco100.C b/macro/tof/tof_reco100.C
index cefb9510db..280ad1347c 100644
--- a/macro/tof/tof_reco100.C
+++ b/macro/tof/tof_reco100.C
@@ -1,6 +1,3 @@
-/** @file tof_reco100.C
-  * @copyright Copyright (C) 2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/tof_reco_Testbeam.C b/macro/tof/tof_reco_Testbeam.C
index 87653a793b..09372da683 100644
--- a/macro/tof/tof_reco_Testbeam.C
+++ b/macro/tof/tof_reco_Testbeam.C
@@ -1,6 +1,3 @@
-/** @file tof_reco_Testbeam.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with sts and tof allone
diff --git a/macro/tof/tof_sim.C b/macro/tof/tof_sim.C
index ef51f420f1..e7880c31c0 100644
--- a/macro/tof/tof_sim.C
+++ b/macro/tof/tof_sim.C
@@ -1,6 +1,3 @@
-/** @file tof_sim.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/tof_sim100.C b/macro/tof/tof_sim100.C
index 88f9e11f7b..1efcd1ff4a 100644
--- a/macro/tof/tof_sim100.C
+++ b/macro/tof/tof_sim100.C
@@ -1,6 +1,3 @@
-/** @file tof_sim100.C
-  * @copyright Copyright (C) 2012-2013 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tof/tof_sim_Testbeam.C b/macro/tof/tof_sim_Testbeam.C
index 2a5277d005..6a3db211b9 100644
--- a/macro/tof/tof_sim_Testbeam.C
+++ b/macro/tof/tof_sim_Testbeam.C
@@ -1,6 +1,3 @@
-/** @file tof_sim_Testbeam.C
-  * @copyright Copyright (C) 2016 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tools/skimming_reco.C b/macro/tools/skimming_reco.C
index b75cce04a7..dddd9f2a2b 100644
--- a/macro/tools/skimming_reco.C
+++ b/macro/tools/skimming_reco.C
@@ -1,6 +1,3 @@
-/** @file skimming_reco.C
-  * @copyright Copyright (C) 2015-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TCollection.h"
 #include "TError.h"
 #include "TFile.h"
diff --git a/macro/tracking/lx/gen_mu_pairs.C b/macro/tracking/lx/gen_mu_pairs.C
index 764534df4e..582ebdbe89 100644
--- a/macro/tracking/lx/gen_mu_pairs.C
+++ b/macro/tracking/lx/gen_mu_pairs.C
@@ -1,6 +1,3 @@
-/** @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 **/
 #include "TDatabasePDG.h"
 #include "TMath.h"
 #include "TRandom3.h"
diff --git a/macro/tracking/lx/run_mc.C b/macro/tracking/lx/run_mc.C
index 5eb14dfe95..037f8c1d33 100644
--- a/macro/tracking/lx/run_mc.C
+++ b/macro/tracking/lx/run_mc.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void run_mc(int index = -1)
 {
   Int_t nEvents = 1000;
diff --git a/macro/tracking/lx/run_reco.C b/macro/tracking/lx/run_reco.C
index e8c310c6ee..8d3be36bb8 100644
--- a/macro/tracking/lx/run_reco.C
+++ b/macro/tracking/lx/run_reco.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void run_reco(int index = -1)
 {
   Int_t nEvents         = 1000;
diff --git a/macro/tracking/lx/run_stat.C b/macro/tracking/lx/run_stat.C
index dea1925cc8..291b7444ed 100644
--- a/macro/tracking/lx/run_stat.C
+++ b/macro/tracking/lx/run_stat.C
@@ -1,6 +1,3 @@
-/** @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 **/
 void run_stat(int index = -1)
 {
   Int_t nEvents         = 1000;
diff --git a/macro/trd/CbmTrdHitsProd.C b/macro/trd/CbmTrdHitsProd.C
index 9a43958539..e637846196 100644
--- a/macro/trd/CbmTrdHitsProd.C
+++ b/macro/trd/CbmTrdHitsProd.C
@@ -1,6 +1,3 @@
-/** @file CbmTrdHitsProd.C
-  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //  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 c30e3e8dc8..d1eb7c8f69 100644
--- a/macro/trd/TimeBasedSim/run_trd_reco.C
+++ b/macro/trd/TimeBasedSim/run_trd_reco.C
@@ -1,6 +1,3 @@
-/** @file run_trd_reco.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for testing the trd digitizer and hit producer
diff --git a/macro/trd/TimeBasedSim/run_trd_sim.C b/macro/trd/TimeBasedSim/run_trd_sim.C
index 504c35f0b2..a1c3867469 100644
--- a/macro/trd/TimeBasedSim/run_trd_sim.C
+++ b/macro/trd/TimeBasedSim/run_trd_sim.C
@@ -1,6 +1,3 @@
-/** @file run_trd_sim.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/beamtime/hv/analyzeHV.C b/macro/trd/beamtime/hv/analyzeHV.C
index 13258cddd9..67f4d901bc 100644
--- a/macro/trd/beamtime/hv/analyzeHV.C
+++ b/macro/trd/beamtime/hv/analyzeHV.C
@@ -1,6 +1,3 @@
-/** @file analyzeHV.C
-  * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TCanvas.h"
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/trd/beamtime/hv/monHV.C b/macro/trd/beamtime/hv/monHV.C
index 24d29c1b1a..78cf2272a2 100644
--- a/macro/trd/beamtime/hv/monHV.C
+++ b/macro/trd/beamtime/hv/monHV.C
@@ -1,6 +1,3 @@
-/** @file monHV.C
-  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TCanvas.h"
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/trd/beamtime/hv/monHVlong.C b/macro/trd/beamtime/hv/monHVlong.C
index 237fe98180..5d706d1fcb 100644
--- a/macro/trd/beamtime/hv/monHVlong.C
+++ b/macro/trd/beamtime/hv/monHVlong.C
@@ -1,6 +1,3 @@
-/** @file monHVlong.C
-  * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TCanvas.h"
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/trd/beamtime/hv/readHV.C b/macro/trd/beamtime/hv/readHV.C
index 0e0303288d..e91510f3f4 100644
--- a/macro/trd/beamtime/hv/readHV.C
+++ b/macro/trd/beamtime/hv/readHV.C
@@ -1,6 +1,3 @@
-/** @file readHV.C
-  * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TCanvas.h"
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/trd/create_geometry_file_root.C b/macro/trd/create_geometry_file_root.C
index 116f61007f..c978e909c9 100644
--- a/macro/trd/create_geometry_file_root.C
+++ b/macro/trd/create_geometry_file_root.C
@@ -1,6 +1,3 @@
-/** @file create_geometry_file_root.C
-  * @copyright Copyright (C) 2012-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro to create a geometry file for the TRD
diff --git a/macro/trd/create_geometry_file_root_test.C b/macro/trd/create_geometry_file_root_test.C
index ad0d54322b..5916ac0cd6 100644
--- a/macro/trd/create_geometry_file_root_test.C
+++ b/macro/trd/create_geometry_file_root_test.C
@@ -1,6 +1,3 @@
-/** @file create_geometry_file_root_test.C
-  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro to create a geometry file for the TRD
diff --git a/macro/trd/data/plotResults.C b/macro/trd/data/plotResults.C
index c172b27fb9..a732276290 100644
--- a/macro/trd/data/plotResults.C
+++ b/macro/trd/data/plotResults.C
@@ -1,6 +1,3 @@
-/** @file plotResults.C
-  * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TBox.h"
 #include "TCanvas.h"
 #include "TChain.h"
diff --git a/macro/trd/data/readResults.C b/macro/trd/data/readResults.C
index 6278003af1..0bf65c13a0 100644
--- a/macro/trd/data/readResults.C
+++ b/macro/trd/data/readResults.C
@@ -1,6 +1,3 @@
-/** @file readResults.C
-  * @copyright Copyright (C) 2014-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TLine.h"
 #include "TMath.h"
 #include "TString.h"
diff --git a/macro/trd/elid/trd_elid_reco.C b/macro/trd/elid/trd_elid_reco.C
index f2bd0f440a..275e337a65 100644
--- a/macro/trd/elid/trd_elid_reco.C
+++ b/macro/trd/elid/trd_elid_reco.C
@@ -1,6 +1,3 @@
-/** @file trd_elid_reco.C
-  * @copyright Copyright (C) 2009-2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void trd_elid_reco(Int_t nEvents = 200)
 {
   Int_t trdNFoils      = 70;
diff --git a/macro/trd/elid/trd_elid_sim.C b/macro/trd/elid/trd_elid_sim.C
index 8c32da8413..62984936b1 100644
--- a/macro/trd/elid/trd_elid_sim.C
+++ b/macro/trd/elid/trd_elid_sim.C
@@ -1,6 +1,3 @@
-/** @file trd_elid_sim.C
-  * @copyright Copyright (C) 2009-2015 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 void trd_elid_sim(Int_t nEvents = 200)
 {
   Double_t minMomentum = 1.5;  //minimum momentum
diff --git a/macro/trd/eventDisplay.C b/macro/trd/eventDisplay.C
index df79fd5f4a..2980df80e8 100644
--- a/macro/trd/eventDisplay.C
+++ b/macro/trd/eventDisplay.C
@@ -1,7 +1,5 @@
-/** @file eventDisplay.C
-  * @copyright Copyright (C) 2009-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // 20130605 - checked by DE
+
 eventDisplay()
 {
 
diff --git a/macro/trd/geometry/plot_hollow_modules.C b/macro/trd/geometry/plot_hollow_modules.C
index 0ab0592674..1bd24b67cf 100644
--- a/macro/trd/geometry/plot_hollow_modules.C
+++ b/macro/trd/geometry/plot_hollow_modules.C
@@ -1,6 +1,3 @@
-/** @file plot_hollow_modules.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //
 //  plot pad size of layers in cm2 in png files
 //  Nov 2012
diff --git a/macro/trd/geometry/plot_pad_size_in_layer.C b/macro/trd/geometry/plot_pad_size_in_layer.C
index 39c6a9abe0..e6809ea701 100644
--- a/macro/trd/geometry/plot_pad_size_in_layer.C
+++ b/macro/trd/geometry/plot_pad_size_in_layer.C
@@ -1,6 +1,3 @@
-/** @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 **/
 //
 //  plot pad size of layers in cm2 in png files
 //  Nov 2012
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 a96100afbe..f71c7865ab 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,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v15a.C
 /// \brief Generates TRD geometry in Root format.
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 8abfe6ffc4..c453bbfd5b 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,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v15a.C
 /// \brief Generates TRD geometry in Root format.
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 ab2b28123f..cfb725e4bf 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,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v15c.C
 /// \brief Generates TRD geometry in Root format.
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 2bc99e27ac..5734e7b2c3 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,6 +1,3 @@
-/** @file Create_TRD_Geometry_v15d_1e.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v15d.C
 /// \brief Generates TRD geometry in Root format.
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 9311574cf6..66ae031386 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,6 +1,3 @@
-/** @file Create_TRD_Geometry_v15d_1m.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v15d.C
 /// \brief Generates TRD geometry in Root format.
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 4c679db0ef..6ba553a99b 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,6 +1,3 @@
-/** @file Create_TRD_Geometry_v15e_1e.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v15e.C
 /// \brief Generates TRD geometry in Root format.
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 c6f66e4f7e..145653be73 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,6 +1,3 @@
-/** @file Create_TRD_Geometry_v15e_1m.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v15e.C
 /// \brief Generates TRD geometry in Root format.
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 e904630491..3d0b89c7ce 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16a.C
-  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v16a.C
 /// \brief Generates TRD geometry in Root format.
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 04221c7ea7..50eb99bd2c 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,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16a_3e.C
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v16a.C
 /// \brief Generates TRD geometry in Root format.
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 4bd1ebd5d7..06e96959d7 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16b.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17a.C
 /// \brief Generates TRD geometry in Root format.
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 1e01e8b89f..1488d7ecd0 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16c.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17a.C
 /// \brief Generates TRD geometry in Root format.
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 46fbbeceef..1f162dca1b 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16d.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17a.C
 /// \brief Generates TRD geometry in Root format.
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 28f3ddac8b..957e5f6d0e 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16e.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17a.C
 /// \brief Generates TRD geometry in Root format.
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 22e81b42f4..d40dcc6d21 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v16f.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17a.C
 /// \brief Generates TRD geometry in Root format.
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 0390b7574c..a07acb8645 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17a.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17a.C
 /// \brief Generates TRD geometry in Root format.
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 347fed4ac9..9366c089ad 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17b.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17b.C
 /// \brief Generates TRD geometry in Root format.
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 1ccd4253b5..7c849b2e74 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17c.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17c.C
 /// \brief Generates TRD geometry in Root format.
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 f83f8c6e56..ace244b591 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17d.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17d.C
 /// \brief Generates TRD geometry in Root format.
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 df38e78060..16d9593f70 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17e.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17e.C
 /// \brief Generates TRD geometry in Root format.
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 014b3425bd..b1d46322d5 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17f.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17f.C
 /// \brief Generates TRD geometry in Root format.
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 f2010f1748..c041be5c36 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17g.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17g.C
 /// \brief Generates TRD geometry in Root format.
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 98baff5e8e..eeed124836 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17h.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17h.C
 /// \brief Generates TRD geometry in Root format.
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 e5eabdf185..26b1f3cd1d 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17i.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17i.C
 /// \brief Generates TRD geometry in Root format.
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 64f6b001f8..5bd26ac844 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17j.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17j.C
 /// \brief Generates TRD geometry in Root format.
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 5cdc516ed4..c221a287e7 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17k.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17k.C
 /// \brief Generates TRD geometry in Root format.
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 57cd3a1bed..ddd07fa0b1 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17l.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17l.C
 /// \brief Generates TRD geometry in Root format.
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 d304c4dd78..e7b509ad03 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17m.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17m.C
 /// \brief Generates TRD geometry in Root format.
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 100a44aaed..cdd16ed85b 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17n.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17n.C
 /// \brief Generates TRD geometry in Root format.
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 e205a91137..1defd333d0 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17o.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17o.C
 /// \brief Generates TRD geometry in Root format.
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 cc9bf91724..90863e246c 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17p.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17n.C
 /// \brief Generates TRD geometry in Root format.
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 a435632703..fec77a3f22 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v17q.C
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v17n.C
 /// \brief Generates TRD geometry in Root format.
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 49f2398b00..248fa67879 100644
--- a/macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C
+++ b/macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C
@@ -1,6 +1,3 @@
-/** @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 **/
 ///
 /// \file Create_TRD_Geometry_v18a.C
 /// \brief Generates TRD geometry in Root format.
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 77c95a1713..803fb011ed 100644
--- a/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C
+++ b/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C
@@ -1,6 +1,3 @@
-/** @file Create_TRD_Geometry_v20a.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ///
 /// \file Create_TRD_Geometry_v20a.C
 /// \brief Generates TRD geometry in Root format.
diff --git a/macro/trd/hitrateDisplay.C b/macro/trd/hitrateDisplay.C
index e5f5dd5f16..9ed8cacd7b 100644
--- a/macro/trd/hitrateDisplay.C
+++ b/macro/trd/hitrateDisplay.C
@@ -1,6 +1,3 @@
-/** @file hitrateDisplay.C
-  * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TCanvas.h"
 #include "TColor.h"
 #include "TFile.h"
diff --git a/macro/trd/mcbm_mc.C b/macro/trd/mcbm_mc.C
index 8eb85262ff..1a7b1017d0 100644
--- a/macro/trd/mcbm_mc.C
+++ b/macro/trd/mcbm_mc.C
@@ -1,6 +1,3 @@
-/** @file mcbm_mc.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/mcbm_reco.C b/macro/trd/mcbm_reco.C
index dac899a636..c3ec807181 100644
--- a/macro/trd/mcbm_reco.C
+++ b/macro/trd/mcbm_reco.C
@@ -1,6 +1,3 @@
-/** @file mcbm_reco.C
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/pidTraining/run_pid_sim.C b/macro/trd/pidTraining/run_pid_sim.C
index fb4e245f17..1cc4991e48 100644
--- a/macro/trd/pidTraining/run_pid_sim.C
+++ b/macro/trd/pidTraining/run_pid_sim.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/run_CbmMCEventHeader.C b/macro/trd/run_CbmMCEventHeader.C
index ab41a32709..42e53ee3ea 100644
--- a/macro/trd/run_CbmMCEventHeader.C
+++ b/macro/trd/run_CbmMCEventHeader.C
@@ -1,6 +1,3 @@
-/** @file run_CbmMCEventHeader.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/run_reco.C b/macro/trd/run_reco.C
index ad3f247b36..be79566474 100644
--- a/macro/trd/run_reco.C
+++ b/macro/trd/run_reco.C
@@ -1,6 +1,3 @@
-/** @file run_reco.C
-  * @copyright Copyright (C) 2009-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_TB.C b/macro/trd/run_reco_TB.C
index 2e7ae5fa8f..bc67d6b18f 100644
--- a/macro/trd/run_reco_TB.C
+++ b/macro/trd/run_reco_TB.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_clusterizer.C b/macro/trd/run_reco_clusterizer.C
index ed5fc66f4b..3d173719f1 100644
--- a/macro/trd/run_reco_clusterizer.C
+++ b/macro/trd/run_reco_clusterizer.C
@@ -1,6 +1,3 @@
-/** @file run_reco_clusterizer.C
-  * @copyright Copyright (C) 2011-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_clusterizerFast.C b/macro/trd/run_reco_clusterizerFast.C
index 5ad969cf4b..c94a1325a1 100644
--- a/macro/trd/run_reco_clusterizerFast.C
+++ b/macro/trd/run_reco_clusterizerFast.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_digitizer.C b/macro/trd/run_reco_digitizer.C
index c81aa1b76d..db6abd5bc8 100644
--- a/macro/trd/run_reco_digitizer.C
+++ b/macro/trd/run_reco_digitizer.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for testing the trd digitizer and hit producer
diff --git a/macro/trd/run_reco_dpb.C b/macro/trd/run_reco_dpb.C
index 3b922c3ddd..2efa69f82f 100644
--- a/macro/trd/run_reco_dpb.C
+++ b/macro/trd/run_reco_dpb.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_hitdensitytest.C b/macro/trd/run_reco_hitdensitytest.C
index da58de58cd..dd7c39c260 100644
--- a/macro/trd/run_reco_hitdensitytest.C
+++ b/macro/trd/run_reco_hitdensitytest.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_hitratetest.C b/macro/trd/run_reco_hitratetest.C
index b233ffc27d..44a9b8f800 100644
--- a/macro/trd/run_reco_hitratetest.C
+++ b/macro/trd/run_reco_hitratetest.C
@@ -1,6 +1,3 @@
-/** @file run_reco_hitratetest.C
-  * @copyright Copyright (C) 2011-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_maf.C b/macro/trd/run_reco_maf.C
index 5ff17a60b9..aca3826f08 100644
--- a/macro/trd/run_reco_maf.C
+++ b/macro/trd/run_reco_maf.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_occupancy.C b/macro/trd/run_reco_occupancy.C
index 00219932b5..bb936fbc91 100644
--- a/macro/trd/run_reco_occupancy.C
+++ b/macro/trd/run_reco_occupancy.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_photon.C b/macro/trd/run_reco_photon.C
index aa25a47055..c0dee7bd23 100644
--- a/macro/trd/run_reco_photon.C
+++ b/macro/trd/run_reco_photon.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_pi0.C b/macro/trd/run_reco_pi0.C
index 6aaca456f5..0ab19c2796 100644
--- a/macro/trd/run_reco_pi0.C
+++ b/macro/trd/run_reco_pi0.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_plot.C b/macro/trd/run_reco_plot.C
index b81248576d..d319149ee6 100644
--- a/macro/trd/run_reco_plot.C
+++ b/macro/trd/run_reco_plot.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_qa.C b/macro/trd/run_reco_qa.C
index 0025f08701..ca98816cc5 100644
--- a/macro/trd/run_reco_qa.C
+++ b/macro/trd/run_reco_qa.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_ratioplot.C b/macro/trd/run_reco_ratioplot.C
index c80fe62b72..ee33909dbe 100644
--- a/macro/trd/run_reco_ratioplot.C
+++ b/macro/trd/run_reco_ratioplot.C
@@ -1,6 +1,3 @@
-/** @file run_reco_ratioplot.C
-  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/run_reco_smearing.C b/macro/trd/run_reco_smearing.C
index d2bb6d78ae..1b9579e461 100644
--- a/macro/trd/run_reco_smearing.C
+++ b/macro/trd/run_reco_smearing.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for testing the trd digitizer and hit producer
diff --git a/macro/trd/run_sim100.C b/macro/trd/run_sim100.C
index b1d3ba4d12..2137aa30e0 100644
--- a/macro/trd/run_sim100.C
+++ b/macro/trd/run_sim100.C
@@ -1,6 +1,3 @@
-/** @file run_sim100.C
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/run_sim_maf.C b/macro/trd/run_sim_maf.C
index f436f4e538..6a8b5b5bf0 100644
--- a/macro/trd/run_sim_maf.C
+++ b/macro/trd/run_sim_maf.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard simulation (transport + digitisation)
diff --git a/macro/trd/run_sim_pi0.C b/macro/trd/run_sim_pi0.C
index c817757521..8549fb6882 100644
--- a/macro/trd/run_sim_pi0.C
+++ b/macro/trd/run_sim_pi0.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/run_sim_qa.C b/macro/trd/run_sim_qa.C
index 3504f039b3..833fa06b5c 100644
--- a/macro/trd/run_sim_qa.C
+++ b/macro/trd/run_sim_qa.C
@@ -1,6 +1,3 @@
-/** @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 **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/run_sim_single_elec.C b/macro/trd/run_sim_single_elec.C
index 2ea32d674b..aa174af4c8 100644
--- a/macro/trd/run_sim_single_elec.C
+++ b/macro/trd/run_sim_single_elec.C
@@ -1,6 +1,3 @@
-/** @file run_sim_single_elec.C
-  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/sim.C b/macro/trd/sim.C
index 14622841f8..512f3d479e 100644
--- a/macro/trd/sim.C
+++ b/macro/trd/sim.C
@@ -1,9 +1,7 @@
-/** @file sim.C
-  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Macro for transport
 {
 
+
   TStopwatch timer;
   timer.Start();
   gDebug = 0;
diff --git a/macro/trd/trd_digi1.C b/macro/trd/trd_digi1.C
index 5bbe2f3b92..9fbe1b31dc 100644
--- a/macro/trd/trd_digi1.C
+++ b/macro/trd/trd_digi1.C
@@ -1,6 +1,3 @@
-/** @file trd_digi1.C
-  * @copyright Copyright (C) 2013-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #// --------------------------------------------------------------------------
 //
 // Macro for testing the trd digitizer and hit producer
diff --git a/macro/trd/trd_digi2.C b/macro/trd/trd_digi2.C
index a59a79f3d4..2af2816373 100644
--- a/macro/trd/trd_digi2.C
+++ b/macro/trd/trd_digi2.C
@@ -1,6 +1,3 @@
-/** @file trd_digi2.C
-  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events with standard settings
diff --git a/macro/trd/trd_sim.C b/macro/trd/trd_sim.C
index 226d442ead..88d2fe98eb 100644
--- a/macro/trd/trd_sim.C
+++ b/macro/trd/trd_sim.C
@@ -1,6 +1,3 @@
-/** @file trd_sim.C
-  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/trd/trd_sim_benchmark.C b/macro/trd/trd_sim_benchmark.C
index 2c6f8405a4..a4fa7051c5 100644
--- a/macro/trd/trd_sim_benchmark.C
+++ b/macro/trd/trd_sim_benchmark.C
@@ -1,6 +1,3 @@
-/** @file trd_sim_benchmark.C
-  * @copyright Copyright (C) 2013-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/tutorial/run_HitProducerTaskIdeal.C b/macro/tutorial/run_HitProducerTaskIdeal.C
index 4ed7c5661b..95391164bb 100644
--- a/macro/tutorial/run_HitProducerTaskIdeal.C
+++ b/macro/tutorial/run_HitProducerTaskIdeal.C
@@ -1,6 +1,3 @@
-/** @file run_HitProducerTaskIdeal.C
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // --------------------------------------------------------------------------
 // Macro to demonstrate the algorith based task
 //
diff --git a/mvd/CbmMvdClusterfinder.cxx b/mvd/CbmMvdClusterfinder.cxx
index 260051e813..3bd0a8bc70 100644
--- a/mvd/CbmMvdClusterfinder.cxx
+++ b/mvd/CbmMvdClusterfinder.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdClusterfinder.cxx
-  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdClusterfinder source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdClusterfinderTB.cxx b/mvd/CbmMvdClusterfinderTB.cxx
index 80e8f96ed6..ca7fe78f52 100644
--- a/mvd/CbmMvdClusterfinderTB.cxx
+++ b/mvd/CbmMvdClusterfinderTB.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdClusterfinderTB.cxx
-  * @copyright Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdClusterfinderTB source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdDigiToHit.cxx b/mvd/CbmMvdDigiToHit.cxx
index 16a5a0aa11..72ba34dd59 100644
--- a/mvd/CbmMvdDigiToHit.cxx
+++ b/mvd/CbmMvdDigiToHit.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdDigiToHit.cxx
-  * @copyright Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdDigiToHit source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdDigiToHitTB.cxx b/mvd/CbmMvdDigiToHitTB.cxx
index 06fb79440e..b2daf219ba 100644
--- a/mvd/CbmMvdDigiToHitTB.cxx
+++ b/mvd/CbmMvdDigiToHitTB.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdDigiToHitTB.cxx
-  * @copyright Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdDigiToHitTB source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdDigitizer.cxx b/mvd/CbmMvdDigitizer.cxx
index 6c7305bde5..29c6cac26d 100644
--- a/mvd/CbmMvdDigitizer.cxx
+++ b/mvd/CbmMvdDigitizer.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdDigitizer.cxx
-  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdDigitizer source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdDigitizerTB.cxx b/mvd/CbmMvdDigitizerTB.cxx
index 920c6faa27..a80e098192 100644
--- a/mvd/CbmMvdDigitizerTB.cxx
+++ b/mvd/CbmMvdDigitizerTB.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdDigitizerTB.cxx
-  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdDigitizerTB source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdHitfinder.cxx b/mvd/CbmMvdHitfinder.cxx
index b78432286e..a4825fdebf 100644
--- a/mvd/CbmMvdHitfinder.cxx
+++ b/mvd/CbmMvdHitfinder.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdHitfinder.cxx
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitfinder source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdHitfinderTB.cxx b/mvd/CbmMvdHitfinderTB.cxx
index a8dd7d6569..78ffcaab8a 100644
--- a/mvd/CbmMvdHitfinderTB.cxx
+++ b/mvd/CbmMvdHitfinderTB.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdHitfinderTB.cxx
-  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitfinderTB source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/CbmMvdLinkDef.h b/mvd/CbmMvdLinkDef.h
index 3182fb205f..3de2cd2f46 100644
--- a/mvd/CbmMvdLinkDef.h
+++ b/mvd/CbmMvdLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmMvdLinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/mvd/CbmMvdReadout.cxx b/mvd/CbmMvdReadout.cxx
index 5f57ad85a5..6773c7fd72 100644
--- a/mvd/CbmMvdReadout.cxx
+++ b/mvd/CbmMvdReadout.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdReadout.cxx
-  * @copyright Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                    CbmMvdClusterfinder source file                -----
 // -------------------------------------------------------------------------
diff --git a/mvd/SensorDataSheets/CbmMvdMimosis.cxx b/mvd/SensorDataSheets/CbmMvdMimosis.cxx
index 32966bb5ab..9c3f92b297 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosis.cxx
+++ b/mvd/SensorDataSheets/CbmMvdMimosis.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdMimosis.cxx
-  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                     CbmMvdMimosis source file                 -----
 // -----                                                               -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosis.h b/mvd/SensorDataSheets/CbmMvdMimosis.h
index f6b4efba89..e96da38c6d 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosis.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosis.h
@@ -1,6 +1,3 @@
-/** @file CbmMvdMimosis.h
-  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                      CbmMvdMimosis header file                -----
 // -----                                                               -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
index 8ea140369c..8dd18c96be 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMvdSensorDigiToHitTask.cxx
-  * @copyright Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigiToHitTask source file        -----
 // -----                  27.11.18 Edited by K. Hunold                 -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
index b16e124278..d12cbc69c7 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
@@ -1,6 +1,3 @@
-/** @file CbmMvdSensorDigiToHitTask.h
-  * @copyright Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----                   CbmMvdSensorClusterfinderTask header file   -----
 // -----                   27.11.18 Edited by K. Hunold                -----
diff --git a/mvd/tools/CbmMvdHelper.h b/mvd/tools/CbmMvdHelper.h
index a550fd1e62..c7b2263525 100644
--- a/mvd/tools/CbmMvdHelper.h
+++ b/mvd/tools/CbmMvdHelper.h
@@ -1,6 +1,4 @@
-/** @file CbmMvdHelper.h
-  * @copyright Copyright (C) 2017-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBMMVDHELPER_H_
 #define CBMMVDHELPER_H_ 1
 enum class CbmMvdSensorTyp
diff --git a/reco/KF/CbmKF.cxx b/reco/KF/CbmKF.cxx
index cba3542221..c360f1301d 100644
--- a/reco/KF/CbmKF.cxx
+++ b/reco/KF/CbmKF.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKF.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKF.h"
+
 #include "CbmDefs.h"
 #include "CbmDigiManager.h"
 #include "CbmKFFieldMath.h"
diff --git a/reco/KF/CbmKFFieldMath.cxx b/reco/KF/CbmKFFieldMath.cxx
index 3137cc4e77..9516157baa 100644
--- a/reco/KF/CbmKFFieldMath.cxx
+++ b/reco/KF/CbmKFFieldMath.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKFFieldMath.cxx
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKFFieldMath.h"
+
 #include "CbmKFMath.h"
 
 #include "FairField.h"
diff --git a/reco/KF/CbmKFHit.cxx b/reco/KF/CbmKFHit.cxx
index 5a3c39c32a..524f980a9f 100644
--- a/reco/KF/CbmKFHit.cxx
+++ b/reco/KF/CbmKFHit.cxx
@@ -1,5 +1,4 @@
-/** @file CbmKFHit.cxx
-  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmKFHit.h"
+
 ClassImp(CbmKFHit);
diff --git a/reco/KF/CbmKFMaterial.cxx b/reco/KF/CbmKFMaterial.cxx
index a2c0295291..1be757e3f2 100644
--- a/reco/KF/CbmKFMaterial.cxx
+++ b/reco/KF/CbmKFMaterial.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKFMaterial.cxx
-  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKFMaterial.h"
+
 #include "CbmKF.h"
 #include "CbmKFMath.h"
 
diff --git a/reco/KF/CbmKFMath.cxx b/reco/KF/CbmKFMath.cxx
index d96979bfb6..beb61fddd9 100644
--- a/reco/KF/CbmKFMath.cxx
+++ b/reco/KF/CbmKFMath.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKFMath.cxx
-  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKFMath.h"
+
 #include "FairField.h"
 #include "FairTrackParam.h"
 
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index 4548d2520b..b8fdfb7441 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleFinder.cxx
-  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 // Cbm Headers ----------------------
 #include "CbmKFParticleFinder.h"
 
diff --git a/reco/KF/CbmKFParticleFinder.h b/reco/KF/CbmKFParticleFinder.h
index 99c12628cf..0c73664692 100644
--- a/reco/KF/CbmKFParticleFinder.h
+++ b/reco/KF/CbmKFParticleFinder.h
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleFinder.h
-  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 #ifndef CbmKFParticleFinder_HH
 #define CbmKFParticleFinder_HH
 
diff --git a/reco/KF/CbmKFParticleFinderPID.cxx b/reco/KF/CbmKFParticleFinderPID.cxx
index 47af8edd71..35b8002efa 100644
--- a/reco/KF/CbmKFParticleFinderPID.cxx
+++ b/reco/KF/CbmKFParticleFinderPID.cxx
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleFinderPID.cxx
-  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 // Cbm Headers ----------------------
 #include "CbmKFParticleFinderPID.h"
 
diff --git a/reco/KF/CbmKFParticleFinderPID.h b/reco/KF/CbmKFParticleFinderPID.h
index fc84436951..a07ace1be0 100644
--- a/reco/KF/CbmKFParticleFinderPID.h
+++ b/reco/KF/CbmKFParticleFinderPID.h
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleFinderPID.h
-  * @copyright Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 #ifndef CbmKFParticleFinderPID_HH
 #define CbmKFParticleFinderPID_HH
 
diff --git a/reco/KF/CbmKFParticleFinderQA.cxx b/reco/KF/CbmKFParticleFinderQA.cxx
index b0aa3eb542..2ab315547c 100644
--- a/reco/KF/CbmKFParticleFinderQA.cxx
+++ b/reco/KF/CbmKFParticleFinderQA.cxx
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleFinderQA.cxx
-  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 // Cbm Headers ----------------------
 #include "CbmKFParticleFinderQA.h"
 
diff --git a/reco/KF/CbmKFParticleFinderQA.h b/reco/KF/CbmKFParticleFinderQA.h
index e1a774c555..b5becaaa66 100644
--- a/reco/KF/CbmKFParticleFinderQA.h
+++ b/reco/KF/CbmKFParticleFinderQA.h
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleFinderQA.h
-  * @copyright Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 #ifndef CbmKFParticleFinderQA_HH
 #define CbmKFParticleFinderQA_HH
 
diff --git a/reco/KF/CbmKFParticleInterface.cxx b/reco/KF/CbmKFParticleInterface.cxx
index 9af357f68e..5787ef677e 100644
--- a/reco/KF/CbmKFParticleInterface.cxx
+++ b/reco/KF/CbmKFParticleInterface.cxx
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleInterface.cxx
-  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 // Cbm Headers ----------------------
 #include "CbmKFParticleInterface.h"
 
diff --git a/reco/KF/CbmKFParticleInterface.h b/reco/KF/CbmKFParticleInterface.h
index 2759fa47cb..a1c3d70785 100644
--- a/reco/KF/CbmKFParticleInterface.h
+++ b/reco/KF/CbmKFParticleInterface.h
@@ -1,8 +1,6 @@
-/** @file CbmKFParticleInterface.h
-  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 #ifndef CbmKFParticleInterface_HH
 #define CbmKFParticleInterface_HH
 
diff --git a/reco/KF/CbmKFPixelMeasurement.cxx b/reco/KF/CbmKFPixelMeasurement.cxx
index 8d91634f0a..acf8fadb36 100644
--- a/reco/KF/CbmKFPixelMeasurement.cxx
+++ b/reco/KF/CbmKFPixelMeasurement.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKFPixelMeasurement.cxx
-  * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKFPixelMeasurement.h"
+
 #include <cmath>
 
 using std::vector;
diff --git a/reco/KF/CbmKFUMeasurement.cxx b/reco/KF/CbmKFUMeasurement.cxx
index 33a763c219..735a975a38 100644
--- a/reco/KF/CbmKFUMeasurement.cxx
+++ b/reco/KF/CbmKFUMeasurement.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKFUMeasurement.cxx
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKFUMeasurement.h"
+
 #include <cmath>
 
 ClassImp(CbmKFUMeasurement)
diff --git a/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx b/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx
index 1448d0612e..fd99968956 100644
--- a/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx
+++ b/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx
@@ -1,7 +1,6 @@
-/** @file CbmEcalTrackExtrapolationKF.cxx
-  * @copyright Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmEcalTrackExtrapolationKF.h"
+
 #include "CbmEcalInf.h"
 #include "CbmEcalStructure.h"
 #include "CbmGlobalTrack.h"
diff --git a/reco/KF/Interface/CbmKFStsHit.cxx b/reco/KF/Interface/CbmKFStsHit.cxx
index 2e9f58cae9..e7ef5a4f62 100644
--- a/reco/KF/Interface/CbmKFStsHit.cxx
+++ b/reco/KF/Interface/CbmKFStsHit.cxx
@@ -1,7 +1,6 @@
-/** @file CbmKFStsHit.cxx
-  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmKFStsHit.h"
+
 #include "CbmKF.h"
 #include "CbmKFMaterial.h"
 #include "CbmKFTrackInterface.h"
diff --git a/reco/KF/Interface/CbmKFStsHit.h b/reco/KF/Interface/CbmKFStsHit.h
index e551f2e6db..c0d290566e 100644
--- a/reco/KF/Interface/CbmKFStsHit.h
+++ b/reco/KF/Interface/CbmKFStsHit.h
@@ -1,8 +1,6 @@
-/** @file CbmKFStsHit.h
-  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmKFStsHit_H
 #define CbmKFStsHit_H 1
+
 #include "CbmKFHit.h"
 #include "CbmKFMaterial.h"
 #include "CbmKFPixelMeasurement.h"
diff --git a/reco/KF/Interface/CbmKFTrack.cxx b/reco/KF/Interface/CbmKFTrack.cxx
index ec2dc6fda0..f893b6a475 100644
--- a/reco/KF/Interface/CbmKFTrack.cxx
+++ b/reco/KF/Interface/CbmKFTrack.cxx
@@ -1,7 +1,5 @@
-/** @file CbmKFTrack.cxx
-  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmKFTrack.h"
+
 #include "CbmKFMath.h"
 #include "CbmStsTrack.h"
 
diff --git a/reco/KF/Interface/CbmKFVertex.cxx b/reco/KF/Interface/CbmKFVertex.cxx
index 45ec61bd2e..bd5d31fd7b 100644
--- a/reco/KF/Interface/CbmKFVertex.cxx
+++ b/reco/KF/Interface/CbmKFVertex.cxx
@@ -1,5 +1,4 @@
-/** @file CbmKFVertex.cxx
-  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmKFVertex.h"
+
 ClassImp(CbmKFVertex);
diff --git a/reco/KF/Interface/CbmKFVertex.h b/reco/KF/Interface/CbmKFVertex.h
index 47f34564fd..4bd09f7670 100644
--- a/reco/KF/Interface/CbmKFVertex.h
+++ b/reco/KF/Interface/CbmKFVertex.h
@@ -1,8 +1,6 @@
-/** @file CbmKFVertex.h
-  * @copyright Copyright (C) 2006-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMKFVERTEX_H
 #define CBMKFVERTEX_H
+
 #include "CbmKFVertexInterface.h"
 
 class CbmKFVertex : public CbmKFVertexInterface {
diff --git a/reco/KF/Interface/CbmPVFinderKF.cxx b/reco/KF/Interface/CbmPVFinderKF.cxx
index d1d0ca5fa3..634f276a65 100644
--- a/reco/KF/Interface/CbmPVFinderKF.cxx
+++ b/reco/KF/Interface/CbmPVFinderKF.cxx
@@ -1,7 +1,5 @@
-/** @file CbmPVFinderKF.cxx
-  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPVFinderKF.h"
+
 #include "CbmEvent.h"
 #include "CbmKFPrimaryVertexFinder.h"
 #include "CbmKFTrack.h"
diff --git a/reco/KF/Interface/CbmStsKFTrackFitter.cxx b/reco/KF/Interface/CbmStsKFTrackFitter.cxx
index b24f612eb0..45dfeafd71 100644
--- a/reco/KF/Interface/CbmStsKFTrackFitter.cxx
+++ b/reco/KF/Interface/CbmStsKFTrackFitter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmStsKFTrackFitter.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmStsKFTrackFitter.h"
+
 #include "CbmKFMath.h"
 #include "CbmKFStsHit.h"
 #include "CbmKFTrack.h"
diff --git a/reco/KF/Interface/CbmStsKFTrackFitter.h b/reco/KF/Interface/CbmStsKFTrackFitter.h
index 9e659caaee..4c3162c8b0 100644
--- a/reco/KF/Interface/CbmStsKFTrackFitter.h
+++ b/reco/KF/Interface/CbmStsKFTrackFitter.h
@@ -1,8 +1,6 @@
-/** @file CbmStsKFTrackFitter.h
-  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMSTSKFTRACKFITTER
 #define CBMSTSKFTRACKFITTER 1
+
 #include "CbmKFStsHit.h"
 #include "CbmStsTrackFitter.h"
 
diff --git a/reco/KF/KFLinkDef.h b/reco/KF/KFLinkDef.h
index 32803cb8d8..372ca46c47 100644
--- a/reco/KF/KFLinkDef.h
+++ b/reco/KF/KFLinkDef.h
@@ -1,7 +1,5 @@
-/** @file KFLinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/KF/KFQA/CbmKFPartEfficiencies.h b/reco/KF/KFQA/CbmKFPartEfficiencies.h
index ad6a2acb6c..733708cd66 100644
--- a/reco/KF/KFQA/CbmKFPartEfficiencies.h
+++ b/reco/KF/KFQA/CbmKFPartEfficiencies.h
@@ -1,8 +1,6 @@
-/** @file CbmKFPartEfficiencies.h
-  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmKFPartEfficiencies_H
 #define CbmKFPartEfficiencies_H
+
 #include "CbmL1Counters.h"
 
 #include "TNamed.h"
diff --git a/reco/KF/KFQA/CbmKFTrackQA.cxx b/reco/KF/KFQA/CbmKFTrackQA.cxx
index cf2fde0276..c108810584 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackQA.cxx
@@ -1,8 +1,6 @@
-/** @file CbmKFTrackQA.cxx
-  * @copyright Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 // Cbm Headers ----------------------
 #include "CbmKFTrackQA.h"
 
diff --git a/reco/KF/KFQA/CbmKFTrackQA.h b/reco/KF/KFQA/CbmKFTrackQA.h
index 01d3d03f33..106aec808a 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.h
+++ b/reco/KF/KFQA/CbmKFTrackQA.h
@@ -1,8 +1,6 @@
-/** @file CbmKFTrackQA.h
-  * @copyright Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //-----------------------------------------------------------
 //-----------------------------------------------------------
+
 #ifndef CbmKFTrackQA_HH
 #define CbmKFTrackQA_HH
 
diff --git a/reco/L1/CbmL1Constants.h b/reco/L1/CbmL1Constants.h
index ed9c471e21..10e2a3cc51 100644
--- a/reco/L1/CbmL1Constants.h
+++ b/reco/L1/CbmL1Constants.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CBML1CONSTANTS_H_
 #define CBML1CONSTANTS_H_
+
 namespace CbmL1Constants
 {
   /// Performance constants
diff --git a/reco/L1/CbmL1Counters.h b/reco/L1/CbmL1Counters.h
index aa20ee5669..565543a202 100644
--- a/reco/L1/CbmL1Counters.h
+++ b/reco/L1/CbmL1Counters.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CbmL1Counters_H
 #define CbmL1Counters_H
+
 #include "TString.h"
 
 #include <fstream>
diff --git a/reco/L1/CbmL1Def.h b/reco/L1/CbmL1Def.h
index e5df13514d..dfb878af3c 100644
--- a/reco/L1/CbmL1Def.h
+++ b/reco/L1/CbmL1Def.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CbmL1Def_h
 #define CbmL1Def_h 1
+
 // #define FAST_CODE // FAST_CODE = more unsafe
 
 
diff --git a/reco/L1/CbmL1StsHit.h b/reco/L1/CbmL1StsHit.h
index 86cd19bdf9..56d4298840 100644
--- a/reco/L1/CbmL1StsHit.h
+++ b/reco/L1/CbmL1StsHit.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef _CbmL1StsHit_h_
 #define _CbmL1StsHit_h_
+
 #include <vector>
 using std::vector;
 
diff --git a/reco/L1/CbmL1TrackPar.h b/reco/L1/CbmL1TrackPar.h
index c4c2c23de6..d6d726148f 100644
--- a/reco/L1/CbmL1TrackPar.h
+++ b/reco/L1/CbmL1TrackPar.h
@@ -1,6 +1,4 @@
-/** @file CbmL1TrackPar.h
-  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CbmL1TrackPar_H
 #define CbmL1TrackPar_H
 
diff --git a/reco/L1/CbmL1TrdTracklet.cxx b/reco/L1/CbmL1TrdTracklet.cxx
index 731760a9f6..311e43e81c 100644
--- a/reco/L1/CbmL1TrdTracklet.cxx
+++ b/reco/L1/CbmL1TrdTracklet.cxx
@@ -1,7 +1,5 @@
-/** @file CbmL1TrdTracklet.cxx
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmL1TrdTracklet.h"
+
 ClassImp(CbmL1TrdTracklet);
 
 // ----------------------- Default constructor ---------------------------
diff --git a/reco/L1/CbmL1TrdTracklet.h b/reco/L1/CbmL1TrdTracklet.h
index 1a0c7d1dfc..8a22c289d9 100644
--- a/reco/L1/CbmL1TrdTracklet.h
+++ b/reco/L1/CbmL1TrdTracklet.h
@@ -1,8 +1,6 @@
-/** @file CbmL1TrdTracklet.h
-  * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBML1TRDTRACKLET_H
 #define CBML1TRDTRACKLET_H 1
+
 #include "TObject.h"
 
 #include <vector>
diff --git a/reco/L1/CbmL1TrdTracklet4.cxx b/reco/L1/CbmL1TrdTracklet4.cxx
index 95bd57919c..4a6eef5df3 100644
--- a/reco/L1/CbmL1TrdTracklet4.cxx
+++ b/reco/L1/CbmL1TrdTracklet4.cxx
@@ -1,7 +1,5 @@
-/** @file CbmL1TrdTracklet4.cxx
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmL1TrdTracklet4.h"
+
 ClassImp(CbmL1TrdTracklet4);
 
 // ----------------------- Default constructor ---------------------------
diff --git a/reco/L1/CbmL1TrdTracklet4.h b/reco/L1/CbmL1TrdTracklet4.h
index 2c8e560562..e5564b5592 100644
--- a/reco/L1/CbmL1TrdTracklet4.h
+++ b/reco/L1/CbmL1TrdTracklet4.h
@@ -1,8 +1,6 @@
-/** @file CbmL1TrdTracklet4.h
-  * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBML1TRDTRACKLET4_H
 #define CBML1TRDTRACKLET4_H 1
+
 #include "TObject.h"
 
 #include <vector>
diff --git a/reco/L1/L1Algo/L1Algo.cxx b/reco/L1/L1Algo/L1Algo.cxx
index 481088203b..f958ba212f 100644
--- a/reco/L1/L1Algo/L1Algo.cxx
+++ b/reco/L1/L1Algo/L1Algo.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "L1Algo.h"
+
 #include "L1Grid.h"
 #include "L1HitPoint.h"
 
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index 2a59076110..6323165164 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -1,8 +1,6 @@
-/** @file L1Algo.h
-  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Algo_h
 #define L1Algo_h 1
+
 // #define TBB // TODO: Doesn't work now. Renew
 
 /// Debug features
diff --git a/reco/L1/L1Algo/L1AlgoTBB.h b/reco/L1/L1Algo/L1AlgoTBB.h
index c0ed11bb94..6813ab369d 100644
--- a/reco/L1/L1Algo/L1AlgoTBB.h
+++ b/reco/L1/L1Algo/L1AlgoTBB.h
@@ -1,9 +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 **/
 #ifndef L1AlgoTBB_h
 #define L1AlgoTBB_h
 
+
 #include "L1Algo.h"
 
 #ifdef TBB
diff --git a/reco/L1/L1Algo/L1Event.cxx b/reco/L1/L1Algo/L1Event.cxx
index ca00a56ef4..eb08e3a7d4 100644
--- a/reco/L1/L1Algo/L1Event.cxx
+++ b/reco/L1/L1Algo/L1Event.cxx
@@ -1,7 +1,5 @@
-/** @file L1Event.cxx
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "L1Event.h"
+
 void L1Event::Clear() { fStsHit.clear(); }
 
 void L1Event::TopoReconstructor()
diff --git a/reco/L1/L1Algo/L1Event.h b/reco/L1/L1Algo/L1Event.h
index 11069822f7..a6ebbefa35 100644
--- a/reco/L1/L1Algo/L1Event.h
+++ b/reco/L1/L1Algo/L1Event.h
@@ -1,8 +1,6 @@
-/** @file L1Event.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Event_H
 #define L1Event_H
+
 #include "CbmL1Track.h"
 
 #include <vector>
diff --git a/reco/L1/L1Algo/L1EventEfficiencies.h b/reco/L1/L1Algo/L1EventEfficiencies.h
index 82c866c23e..ee1511c4ef 100644
--- a/reco/L1/L1Algo/L1EventEfficiencies.h
+++ b/reco/L1/L1Algo/L1EventEfficiencies.h
@@ -1,7 +1,5 @@
-/** @file L1EventEfficiencies.h
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmL1Counters.h"
+
 #include <cstring>
 #include <iostream>
 
diff --git a/reco/L1/L1Algo/L1EventMatch.cxx b/reco/L1/L1Algo/L1EventMatch.cxx
index 1df2e7e7fe..61cafa7cb4 100644
--- a/reco/L1/L1Algo/L1EventMatch.cxx
+++ b/reco/L1/L1Algo/L1EventMatch.cxx
@@ -1,7 +1,5 @@
-/** @file L1EventMatch.cxx
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "L1EventMatch.h"
+
 void L1EventMatch::Clear()
 {
   fMCEvent.clear();
diff --git a/reco/L1/L1Algo/L1EventMatch.h b/reco/L1/L1Algo/L1EventMatch.h
index cb797aac99..1ac2c2a322 100644
--- a/reco/L1/L1Algo/L1EventMatch.h
+++ b/reco/L1/L1Algo/L1EventMatch.h
@@ -1,8 +1,6 @@
-/** @file L1EventMatch.h
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1EventMatch_H
 #define L1EventMatch_H
+
 #include <map>
 #include <vector>
 
diff --git a/reco/L1/L1Algo/L1Extrapolation.h b/reco/L1/L1Algo/L1Extrapolation.h
index 41ea852c7e..1503a226e7 100644
--- a/reco/L1/L1Algo/L1Extrapolation.h
+++ b/reco/L1/L1Algo/L1Extrapolation.h
@@ -1,8 +1,6 @@
-/** @file L1Extrapolation.h
-  * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Extrapolation_h
 #define L1Extrapolation_h
+
 #include "CbmL1Def.h"
 
 #include "L1Field.h"
diff --git a/reco/L1/L1Algo/L1Field.h b/reco/L1/L1Algo/L1Field.h
index 3944582a18..3e9fee8653 100644
--- a/reco/L1/L1Algo/L1Field.h
+++ b/reco/L1/L1Algo/L1Field.h
@@ -1,8 +1,6 @@
-/** @file L1Field.h
-  * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Field_h
 #define L1Field_h 1
+
 #include "CbmL1Def.h"
 
 #include <iostream>
diff --git a/reco/L1/L1Algo/L1Filtration.h b/reco/L1/L1Algo/L1Filtration.h
index 1d36b78c36..b4d090ad4d 100644
--- a/reco/L1/L1Algo/L1Filtration.h
+++ b/reco/L1/L1Algo/L1Filtration.h
@@ -1,8 +1,6 @@
-/** @file L1Filtration.h
-  * @copyright Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Filtration_h
 #define L1Filtration_h
+
 #include "CbmL1Def.h"
 
 #include "L1TrackPar.h"
diff --git a/reco/L1/L1Algo/L1FitMaterial.h b/reco/L1/L1Algo/L1FitMaterial.h
index 4d83daf167..ea3537f80d 100644
--- a/reco/L1/L1Algo/L1FitMaterial.h
+++ b/reco/L1/L1Algo/L1FitMaterial.h
@@ -1,8 +1,6 @@
-/** @file L1FitMaterial.h
-  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1FitMaterial_h
 #define L1FitMaterial_h
+
 #include "CbmL1Def.h"
 
 #include "L1MaterialInfo.h"
diff --git a/reco/L1/L1Algo/L1Grid.cxx b/reco/L1/L1Algo/L1Grid.cxx
index c20f13ca7a..21f1ad8732 100644
--- a/reco/L1/L1Algo/L1Grid.cxx
+++ b/reco/L1/L1Algo/L1Grid.cxx
@@ -1,7 +1,5 @@
-/** @file L1Grid.cxx
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "L1Grid.h"
+
 #include "CbmL1Def.h"
 
 #include <algorithm>
diff --git a/reco/L1/L1Algo/L1HitArea.h b/reco/L1/L1Algo/L1HitArea.h
index bc3b5ed399..4e8464bb5a 100644
--- a/reco/L1/L1Algo/L1HitArea.h
+++ b/reco/L1/L1Algo/L1HitArea.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1HitArea_H
 #define L1HitArea_H
+
 #include "CbmL1Def.h"
 
 #include "L1Grid.h"
diff --git a/reco/L1/L1Algo/L1HitPoint.h b/reco/L1/L1Algo/L1HitPoint.h
index e3c891766e..47f227e5f8 100644
--- a/reco/L1/L1Algo/L1HitPoint.h
+++ b/reco/L1/L1Algo/L1HitPoint.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef _L1HitPoint_h_
 #define _L1HitPoint_h_
+
 /// contain strips positions and coordinates of hit
 #if 1
 struct L1HitPoint {
diff --git a/reco/L1/L1Algo/L1HitsSortHelper.cxx b/reco/L1/L1Algo/L1HitsSortHelper.cxx
index 90fd1c02d2..8708831308 100644
--- a/reco/L1/L1Algo/L1HitsSortHelper.cxx
+++ b/reco/L1/L1Algo/L1HitsSortHelper.cxx
@@ -1,7 +1,6 @@
-/** @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 **/
+
 #include "L1HitsSortHelper.h"
+
 #include <algorithm>
 #include <vector>
 
diff --git a/reco/L1/L1Algo/L1HitsSortHelper.h b/reco/L1/L1Algo/L1HitsSortHelper.h
index 1eb12cce8c..cdd10f4765 100644
--- a/reco/L1/L1Algo/L1HitsSortHelper.h
+++ b/reco/L1/L1Algo/L1HitsSortHelper.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef _L1HitsL1HitsSortHelper_h_
 #define _L1HitsL1HitsSortHelper_h_
+
 #include <algorithm>
 #include <vector>
 
diff --git a/reco/L1/L1Algo/L1MCEvent.cxx b/reco/L1/L1Algo/L1MCEvent.cxx
index c4ef9f4a8b..6067924082 100644
--- a/reco/L1/L1Algo/L1MCEvent.cxx
+++ b/reco/L1/L1Algo/L1MCEvent.cxx
@@ -1,7 +1,5 @@
-/** @file L1MCEvent.cxx
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "L1MCEvent.h"
+
 int L1MCEvent::IsReconstructed()
 {
   if (fRecoEvents.size() > 0) return 1;
diff --git a/reco/L1/L1Algo/L1MCEvent.h b/reco/L1/L1Algo/L1MCEvent.h
index bb61c2eed8..6fb7f0d580 100644
--- a/reco/L1/L1Algo/L1MCEvent.h
+++ b/reco/L1/L1Algo/L1MCEvent.h
@@ -1,8 +1,6 @@
-/** @file L1MCEvent.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1MCEvent_H
 #define L1MCEvent_H
+
 #include <vector>
 
 using std::vector;
diff --git a/reco/L1/L1Algo/L1MaterialInfo.h b/reco/L1/L1Algo/L1MaterialInfo.h
index 54584409e5..9a3aa0a0d0 100644
--- a/reco/L1/L1Algo/L1MaterialInfo.h
+++ b/reco/L1/L1Algo/L1MaterialInfo.h
@@ -1,8 +1,6 @@
-/** @file L1MaterialInfo.h
-  * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1MaterialInfo_h
 #define L1MaterialInfo_h
+
 #include "../CbmL1Def.h"
 
 #include <vector>
diff --git a/reco/L1/L1Algo/L1Portion.h b/reco/L1/L1Algo/L1Portion.h
index 9608eee55c..4819f2ed27 100644
--- a/reco/L1/L1Algo/L1Portion.h
+++ b/reco/L1/L1Algo/L1Portion.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1Portion_H
 #define L1Portion_H
+
 #include <vector>
 
 #include "L1TrackPar.h"
diff --git a/reco/L1/L1Algo/L1Station.h b/reco/L1/L1Algo/L1Station.h
index ba3cab2328..6616eba12c 100644
--- a/reco/L1/L1Algo/L1Station.h
+++ b/reco/L1/L1Algo/L1Station.h
@@ -1,8 +1,6 @@
-/** @file L1Station.h
-  * @copyright Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Station_h
 #define L1Station_h 1
+
 #include "L1Field.h"
 #include "L1MaterialInfo.h"
 #include "L1UMeasurementInfo.h"
diff --git a/reco/L1/L1Algo/L1StsHit.h b/reco/L1/L1Algo/L1StsHit.h
index cee497f24e..f0f78baaf7 100644
--- a/reco/L1/L1Algo/L1StsHit.h
+++ b/reco/L1/L1Algo/L1StsHit.h
@@ -1,8 +1,6 @@
-/** @file L1StsHit.h
-  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef _L1StsHit_h_
 #define _L1StsHit_h_
+
 //struct L1Branch;
 typedef unsigned /*short*/ int THitI;    // strip index type
 typedef unsigned short int TZPosI;       // strip z-coor index type
diff --git a/reco/L1/L1Algo/L1TrackExtender.cxx b/reco/L1/L1Algo/L1TrackExtender.cxx
index 4352c29f8f..7816725cb5 100644
--- a/reco/L1/L1Algo/L1TrackExtender.cxx
+++ b/reco/L1/L1Algo/L1TrackExtender.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include <iostream>
+
 #include "L1Algo.h"
 #include "L1Branch.h"
 #include "L1Extrapolation.h"
diff --git a/reco/L1/L1Algo/L1TrackPar.h b/reco/L1/L1Algo/L1TrackPar.h
index 23b733f06a..e780c99696 100644
--- a/reco/L1/L1Algo/L1TrackPar.h
+++ b/reco/L1/L1Algo/L1TrackPar.h
@@ -1,8 +1,6 @@
-/** @file L1TrackPar.h
-  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1TrackPar_h
 #define L1TrackPar_h 1
+
 #include "../CbmL1Def.h"
 
 class L1TrackPar {
diff --git a/reco/L1/L1Algo/L1TrackParFit.cxx b/reco/L1/L1Algo/L1TrackParFit.cxx
index 32fcd7191f..bbcb10f81d 100644
--- a/reco/L1/L1Algo/L1TrackParFit.cxx
+++ b/reco/L1/L1Algo/L1TrackParFit.cxx
@@ -1,7 +1,5 @@
-/** @file L1TrackParFit.cxx
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "L1TrackParFit.h"
+
 #include "L1Fit.h"
 
 const fvec PipeRadThick   = 7.87e-3f;      // 0.7 mm Aluminium
diff --git a/reco/L1/L1Algo/L1TrackParFit.h b/reco/L1/L1Algo/L1TrackParFit.h
index 2c60dc11a8..970acbc01b 100644
--- a/reco/L1/L1Algo/L1TrackParFit.h
+++ b/reco/L1/L1Algo/L1TrackParFit.h
@@ -1,8 +1,6 @@
-/** @file L1TrackParFit.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1TrackParFit_h
 #define L1TrackParFit_h
+
 #include "../CbmL1Def.h"
 
 #include "L1Field.h"
diff --git a/reco/L1/L1Algo/L1Triplet.h b/reco/L1/L1Algo/L1Triplet.h
index 38f30a9d7d..5fedfadf07 100644
--- a/reco/L1/L1Algo/L1Triplet.h
+++ b/reco/L1/L1Algo/L1Triplet.h
@@ -1,6 +1,3 @@
-/** @file L1Triplet.h
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Triplet_H
 #define L1Triplet_H
 #include "../CbmL1Def.h"
diff --git a/reco/L1/L1Algo/L1UMeasurementInfo.h b/reco/L1/L1Algo/L1UMeasurementInfo.h
index 4f01c06200..597fbe01a4 100644
--- a/reco/L1/L1Algo/L1UMeasurementInfo.h
+++ b/reco/L1/L1Algo/L1UMeasurementInfo.h
@@ -1,8 +1,6 @@
-/** @file L1UMeasurementInfo.h
-  * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1UMeasurementInfo_h
 #define L1UMeasurementInfo_h 1
+
 #include "../CbmL1Def.h"
 
 
diff --git a/reco/L1/L1Algo/L1XYMeasurementInfo.h b/reco/L1/L1Algo/L1XYMeasurementInfo.h
index 84b872b6c5..3ba814a98c 100644
--- a/reco/L1/L1Algo/L1XYMeasurementInfo.h
+++ b/reco/L1/L1Algo/L1XYMeasurementInfo.h
@@ -1,8 +1,6 @@
-/** @file L1XYMeasurementInfo.h
-  * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1XYMeasurementInfo_h
 #define L1XYMeasurementInfo_h 1
+
 #include "../CbmL1Def.h"
 
 
diff --git a/reco/L1/L1Algo/utils/L1AlgoDraw.h b/reco/L1/L1Algo/utils/L1AlgoDraw.h
index 3bdc67c8f6..7e6b37f9cc 100644
--- a/reco/L1/L1Algo/utils/L1AlgoDraw.h
+++ b/reco/L1/L1Algo/utils/L1AlgoDraw.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1AlgoDraw_h
 #define L1AlgoDraw_h 1
+
 #define DRAW
 
 #include "CbmKF.h"
diff --git a/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h b/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h
index 4a25167144..e65ad072a4 100644
--- a/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h
+++ b/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1AlgoEfficiencyPerformance_h
 #define L1AlgoEfficiencyPerformance_h
+
 /**
 *   Class for tracklets reconstruction efficiency calculation. Used for debug of CATrackFinder.
 *
diff --git a/reco/L1/L1Algo/utils/L1AlgoPulls.h b/reco/L1/L1Algo/utils/L1AlgoPulls.h
index 3ce77bafb8..7fa789eda0 100644
--- a/reco/L1/L1Algo/utils/L1AlgoPulls.h
+++ b/reco/L1/L1Algo/utils/L1AlgoPulls.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1AlgoPulls_h
 #define L1AlgoPulls_h
+
 // #define BUILD_HISTO_FOR_EACH_STANTION
 
 #ifdef BUILD_HISTO_FOR_EACH_STANTION
diff --git a/reco/L1/L1Algo/utils/L1CADebug.h b/reco/L1/L1Algo/utils/L1CADebug.h
index 32aceb1e91..2cbe18c3c4 100644
--- a/reco/L1/L1Algo/utils/L1CADebug.h
+++ b/reco/L1/L1Algo/utils/L1CADebug.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1CADebug_h
 #define L1CADebug_h 1
+
 #define DEBUG_CA
 
 #include "CbmL1.h"
diff --git a/reco/L1/L1AlgoInputData.cxx b/reco/L1/L1AlgoInputData.cxx
index 6be816ca82..cc3973f6eb 100644
--- a/reco/L1/L1AlgoInputData.cxx
+++ b/reco/L1/L1AlgoInputData.cxx
@@ -1,7 +1,5 @@
-/** @file L1AlgoInputData.cxx
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "L1AlgoInputData.h"
+
 #include <cstring>
 #include <iostream>
 using namespace std;
diff --git a/reco/L1/L1AlgoInputData.h b/reco/L1/L1AlgoInputData.h
index 2d0f5d8b1d..c2d3551d22 100644
--- a/reco/L1/L1AlgoInputData.h
+++ b/reco/L1/L1AlgoInputData.h
@@ -1,8 +1,6 @@
-/** @file L1AlgoInputData.h
-  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef _L1AlgoInputData_h
 #define _L1AlgoInputData_h
+
 #include "CbmL1Def.h"
 
 #include <fstream>
diff --git a/reco/L1/L1LinkDef.h b/reco/L1/L1LinkDef.h
index 97b9aadff6..144bd6b28b 100644
--- a/reco/L1/L1LinkDef.h
+++ b/reco/L1/L1LinkDef.h
@@ -1,7 +1,5 @@
-/** @file L1LinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: L1LinkDef.h,v 1.10 2006/05/18 11:36:47 friese Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx b/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx
index 8c49dade76..e5fbb3ecaa 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx
@@ -1,7 +1,5 @@
-/** @file CbmL1MuchFinder.cxx
-  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmL1MuchFinder.h"
+
 #include "CbmKF.h"
 #include "CbmKFHit.h"
 #include "CbmKFMaterial.h"
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinder.h b/reco/L1/OffLineInterface/CbmL1MuchFinder.h
index f611a6dab3..962e140947 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinder.h
@@ -1,6 +1,4 @@
-/** @file CbmL1MuchFinder.h
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 4b658683bf..521f3337ff 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmL1MuchFinderQa.cxx
-  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmL1MuchFinderQa.h"
+
 #include "CbmKF.h"
 #include "CbmKFHit.h"
 #include "CbmKFMaterial.h"
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h
index 91dc2471fc..1b20a24764 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h
@@ -1,6 +1,4 @@
-/** @file CbmL1MuchFinderQa.h
-  * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 1b15926e9b..50153d8327 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchHit.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchHit.cxx
@@ -1,7 +1,6 @@
-/** @file CbmL1MuchHit.cxx
-  * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmL1MuchHit.h"
+
 #include "CbmKF.h"
 #include "CbmKFTrackInterface.h"
 #include "CbmMuchHit.h"
diff --git a/reco/L1/OffLineInterface/CbmL1MuchHit.h b/reco/L1/OffLineInterface/CbmL1MuchHit.h
index b340852f50..334016710a 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchHit.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchHit.h
@@ -1,8 +1,6 @@
-/** @file CbmL1MuchHit.h
-  * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_L1_MuchHit_h
 #define CBM_L1_MuchHit_h
+
 #include "CbmKFHit.h"
 #include "CbmKFPixelMeasurement.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx b/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx
index 5a0f7c1566..ff80646efc 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx
@@ -1,7 +1,6 @@
-/** @file CbmL1MuchTrack.cxx
-  * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmL1MuchTrack.h"
+
 #include "CbmKFMath.h"
 #include "CbmStsTrack.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1MuchTrack.h b/reco/L1/OffLineInterface/CbmL1MuchTrack.h
index 93e38d9507..dd06c21707 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchTrack.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchTrack.h
@@ -1,8 +1,6 @@
-/** @file CbmL1MuchTrack.h
-  * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_L1_MuchTrack_h
 #define CBM_L1_MuchTrack_h
+
 #include "CbmKFTrackInterface.h"
 #include "CbmL1MuchHit.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx b/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx
index 9ad5636137..30fdc244fc 100644
--- a/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmL1RichRingQa.cxx
-  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmL1RichRingQa.h"
+
 #include "CbmL1Def.h"
 #include "CbmMCTrack.h"
 #include "CbmRichHit.h"
diff --git a/reco/L1/OffLineInterface/CbmL1RichRingQa.h b/reco/L1/OffLineInterface/CbmL1RichRingQa.h
index 27cc3b68c8..731e4bbae3 100644
--- a/reco/L1/OffLineInterface/CbmL1RichRingQa.h
+++ b/reco/L1/OffLineInterface/CbmL1RichRingQa.h
@@ -1,8 +1,6 @@
-/** @file CbmL1RichRingQa.h
-  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBML1RICHRINGQA_H
 #define CBML1RICHRINGQA_H
+
 #include "FairTask.h"
 
 #include "TArc.h"
diff --git a/reco/L1/OffLineInterface/CbmL1SttHit.cxx b/reco/L1/OffLineInterface/CbmL1SttHit.cxx
index 7379d2e9d8..0e107e3ed5 100644
--- a/reco/L1/OffLineInterface/CbmL1SttHit.cxx
+++ b/reco/L1/OffLineInterface/CbmL1SttHit.cxx
@@ -1,7 +1,6 @@
-/** @file CbmL1SttHit.cxx
-  * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmL1SttHit.h"
+
 #include "CbmKF.h"
 #include "CbmKFTrackInterface.h"
 #include "CbmSttHit.h"
diff --git a/reco/L1/OffLineInterface/CbmL1SttHit.h b/reco/L1/OffLineInterface/CbmL1SttHit.h
index 8fbfdc1209..6b2486bd14 100644
--- a/reco/L1/OffLineInterface/CbmL1SttHit.h
+++ b/reco/L1/OffLineInterface/CbmL1SttHit.h
@@ -1,8 +1,6 @@
-/** @file CbmL1SttHit.h
-  * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_L1_STTHIT_h
 #define CBM_L1_STTHIT_h
+
 #include "CbmKFHit.h"
 //#include "CbmKFPixelMeasurement.h"
 #include "CbmKFUMeasurement.h"
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrack.cxx b/reco/L1/OffLineInterface/CbmL1SttTrack.cxx
index 2daf87e9a4..bf76c01540 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrack.cxx
+++ b/reco/L1/OffLineInterface/CbmL1SttTrack.cxx
@@ -1,7 +1,6 @@
-/** @file CbmL1SttTrack.cxx
-  * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmL1SttTrack.h"
+
 #include "CbmKFMath.h"
 #include "CbmMuchTrack.h"
 #include "CbmStsTrack.h"
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrack.h b/reco/L1/OffLineInterface/CbmL1SttTrack.h
index d797ca1f85..5f48af6ead 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrack.h
+++ b/reco/L1/OffLineInterface/CbmL1SttTrack.h
@@ -1,8 +1,6 @@
-/** @file CbmL1SttTrack.h
-  * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBM_L1_STTTRACK_h
 #define CBM_L1_STTTRACK_h
+
 #include "CbmKFTrackInterface.h"
 #include "CbmL1SttHit.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h b/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h
index 3f62c3cb69..e075144304 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h
@@ -1,6 +1,4 @@
-/** @file CbmL1SttTrackFinder.h
-  * @copyright Copyright (C) 2008-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBM_L1_STTTRACKFINDER_H
 #define CBM_L1_STTTRACKFINDER_H
 
diff --git a/reco/L1/PerformanceConstants.h b/reco/L1/PerformanceConstants.h
index 9f5b2d1c66..4b916650bc 100644
--- a/reco/L1/PerformanceConstants.h
+++ b/reco/L1/PerformanceConstants.h
@@ -1,8 +1,6 @@
-/** @file PerformanceConstants.h
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef _PerformanceConstants_h
 #define _PerformanceConstants_h
+
 namespace PerformanceConstants
 {
   const double MinRecoMom   = 0.1;  // Extra set of tracks = (MinRecoMom, MinRefMom)
diff --git a/reco/L1/utils/Draw_L1_histo.C b/reco/L1/utils/Draw_L1_histo.C
index 89f6c12be3..ed263bfc47 100644
--- a/reco/L1/utils/Draw_L1_histo.C
+++ b/reco/L1/utils/Draw_L1_histo.C
@@ -1,7 +1,5 @@
-/** @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 **/
 #include <unistd.h>  // for dir navigation
+
 const int textFont = 22;  // TNewRoman
 const bool divide  = 0;   // = 0 - each histo in separate file\screen. = 1 - all in one file\screen
 
diff --git a/reco/L1/vectors/P4_F32vec4.h b/reco/L1/vectors/P4_F32vec4.h
index 04e5b78619..bbb52e891e 100644
--- a/reco/L1/vectors/P4_F32vec4.h
+++ b/reco/L1/vectors/P4_F32vec4.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1Algo_F32vec4P4_H
 #define L1Algo_F32vec4P4_H
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/L1/vectors/P4_F64vec2.h b/reco/L1/vectors/P4_F64vec2.h
index 9cd320642a..6bafc0b6b0 100644
--- a/reco/L1/vectors/P4_F64vec2.h
+++ b/reco/L1/vectors/P4_F64vec2.h
@@ -1,8 +1,6 @@
-/** @file P4_F64vec2.h
-  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef L1Algo_F64vec2P4_H
 #define L1Algo_F64vec2P4_H
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/L1/vectors/PSEUDO_F32vec1.h b/reco/L1/vectors/PSEUDO_F32vec1.h
index 22f871b970..a6301c6d0e 100644
--- a/reco/L1/vectors/PSEUDO_F32vec1.h
+++ b/reco/L1/vectors/PSEUDO_F32vec1.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CBM_KF_F32vec1_H
 #define CBM_KF_F32vec1_H
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/L1/vectors/PSEUDO_F32vec4.h b/reco/L1/vectors/PSEUDO_F32vec4.h
index 0bf0ed8916..fb3108cdb6 100644
--- a/reco/L1/vectors/PSEUDO_F32vec4.h
+++ b/reco/L1/vectors/PSEUDO_F32vec4.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1Algo_PSEUDO_F32vec4_H
 #define L1Algo_PSEUDO_F32vec4_H
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/L1/vectors/PSEUDO_F64vec1.h b/reco/L1/vectors/PSEUDO_F64vec1.h
index 8ffdc5480a..b434cd6d28 100644
--- a/reco/L1/vectors/PSEUDO_F64vec1.h
+++ b/reco/L1/vectors/PSEUDO_F64vec1.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef L1Algo_PSEUDO_F64vec1_H
 #define L1Algo_PSEUDO_F64vec1_H
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/L1/vectors/std_alloc.h b/reco/L1/vectors/std_alloc.h
index 4f966a41f5..b09f121a05 100644
--- a/reco/L1/vectors/std_alloc.h
+++ b/reco/L1/vectors/std_alloc.h
@@ -1,6 +1,3 @@
-/** @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 **/
 #ifndef STD_ALLOC_H
 #define STD_ALLOC_H
 // ---------------------- Allocator for using STL ------------------------
diff --git a/reco/L1/vectors/vec_arithmetic.h b/reco/L1/vectors/vec_arithmetic.h
index 0fcbaf5c51..0c7209aaf4 100644
--- a/reco/L1/vectors/vec_arithmetic.h
+++ b/reco/L1/vectors/vec_arithmetic.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef _vec_arithmetic_H
 #define _vec_arithmetic_H
+
 /* Define all operators after definition of  basic operators */
 
 #define vec_arithmetic(V, S)                                                                                           \
diff --git a/reco/base/CbmRecoBaseLinkDef.h b/reco/base/CbmRecoBaseLinkDef.h
index 4997137f9f..0ed03aa1c9 100644
--- a/reco/base/CbmRecoBaseLinkDef.h
+++ b/reco/base/CbmRecoBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRecoBaseLinkDef.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/calibration/CbmRecoCalLinkDef.h b/reco/calibration/CbmRecoCalLinkDef.h
index 5faafb4858..50a1b994be 100644
--- a/reco/calibration/CbmRecoCalLinkDef.h
+++ b/reco/calibration/CbmRecoCalLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRecoCalLinkDef.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/much/CbmMuchMatchTracks.cxx b/reco/detectors/much/CbmMuchMatchTracks.cxx
index e55df07b82..6cb301e470 100644
--- a/reco/detectors/much/CbmMuchMatchTracks.cxx
+++ b/reco/detectors/much/CbmMuchMatchTracks.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMuchMatchTracks.cxx
-  * @copyright Copyright (C) 2007-2020 St. Petersburg Polytechnic University, St. Petersburg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmMuchMatchTracks.h"
+
 #include "CbmMuchCluster.h"
 #include "CbmMuchDigiMatch.h"
 #include "CbmMuchPixelHit.h"
diff --git a/reco/detectors/much/CbmMuchRecoLinkDef.h b/reco/detectors/much/CbmMuchRecoLinkDef.h
index b286b5ce58..e6c3fb6852 100644
--- a/reco/detectors/much/CbmMuchRecoLinkDef.h
+++ b/reco/detectors/much/CbmMuchRecoLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmMuchRecoLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
index c6c512d02e..09dea6029f 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
@@ -1,7 +1,5 @@
-/** @file CbmPsdMCbmHitProducer.cxx
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmPsdMCbmHitProducer.h"
+
 #include "CbmDigiManager.h"
 #include "CbmEvent.h"
 #include "CbmPsdDigi.h"
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.h b/reco/detectors/psd/CbmPsdMCbmHitProducer.h
index 0ace19d419..919f17615a 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.h
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.h
@@ -1,6 +1,4 @@
-/** @file CbmPsdMCbmHitProducer.h
-  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 50a6b38f6b..62b59ea35e 100644
--- a/reco/detectors/psd/CbmPsdRecoLinkDef.h
+++ b/reco/detectors/psd/CbmPsdRecoLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmPsdRecoLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/rich/CbmRichConverter.cxx b/reco/detectors/rich/CbmRichConverter.cxx
index bb84f7b628..749151411e 100644
--- a/reco/detectors/rich/CbmRichConverter.cxx
+++ b/reco/detectors/rich/CbmRichConverter.cxx
@@ -1,5 +1,3 @@
-/** @file CbmRichConverter.cxx
-  * @copyright Copyright (C) 2012 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichConverter.h"
+
 TClonesArray* CbmRichConverter::fRichHits = NULL;
diff --git a/reco/detectors/rich/CbmRichRecoLinkDef.h b/reco/detectors/rich/CbmRichRecoLinkDef.h
index 58b652b181..e94d1efa44 100644
--- a/reco/detectors/rich/CbmRichRecoLinkDef.h
+++ b/reco/detectors/rich/CbmRichRecoLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRichRecoLinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.cxx b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
index 45ff8b59a2..247118a51b 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
@@ -1,8 +1,6 @@
-/** @file CbmRichAlignment.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ---------- Original Headers ---------- //
 #include "CbmRichAlignment.h"
+
 #include "CbmDrawHist.h"
 #include "CbmRichHit.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.h b/reco/detectors/rich/alignment/CbmRichAlignment.h
index ae5a60e595..d376f378dc 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.h
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.h
@@ -1,9 +1,7 @@
-/** @file CbmRichAlignment.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHALIGNMENT_H
 #define CBMRICHALIGNMENT_H
 
+
 #include "CbmHistManager.h"
 #include "CbmRichRingFitterCOP.h"
 #include "CbmRichRingFitterEllipseTau.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.cxx b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
index ea8facefb5..fbd605ca36 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
@@ -1,8 +1,6 @@
-/** @file CbmRichCorrection.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ---------- Original Headers ---------- //
 #include "CbmRichCorrection.h"
+
 #include "CbmDrawHist.h"
 #include "CbmRichHit.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.h b/reco/detectors/rich/alignment/CbmRichCorrection.h
index 22d51e0aff..b62c10bcd5 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.h
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.h
@@ -1,9 +1,7 @@
-/** @file CbmRichCorrection.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHCORRECTION_H
 #define CBMRICHCORRECTION_H
 
+
 #include "CbmHistManager.h"
 #include "CbmRichPoint.h"
 #include "CbmRichRecGeoPar.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
index 65e9b78cd0..62f62b835f 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
@@ -1,8 +1,6 @@
-/** @file CbmRichCorrectionVector.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ---------- Original Headers ---------- //
 #include "CbmRichCorrectionVector.h"
+
 #include "CbmDrawHist.h"
 #include "CbmRichHit.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.h b/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
index a2c2c64959..627e10cebb 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
@@ -1,9 +1,7 @@
-/** @file CbmRichCorrectionVector.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmRichCorrectionVector_H
 #define CbmRichCorrectionVector_H
 
+
 #include "CbmHistManager.h"
 #include "CbmRichPoint.h"
 #include "CbmRichRecGeoPar.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.cxx b/reco/detectors/rich/alignment/CbmRichMirror.cxx
index f1762e8c23..9f7181daa6 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirror.cxx
@@ -1,8 +1,6 @@
-/** @file CbmRichMirror.cxx
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ---------- Original Headers ---------- //
 #include "CbmRichMirror.h"
+
 #include "FairRootManager.h"
 #include <Logger.h>
 
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.h b/reco/detectors/rich/alignment/CbmRichMirror.h
index 6b63815e8f..947b18ec3e 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.h
+++ b/reco/detectors/rich/alignment/CbmRichMirror.h
@@ -1,9 +1,7 @@
-/** @file CbmRichMirror.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHMIRROR_H
 #define CBMRICHMIRROR_H
 
+
 #include "CbmRichRingLight.h"
 
 #include "FairTask.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
index 47a3154bd8..d0f3a0d9fa 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMirrorSortingAlignment.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMirrorSortingAlignment.h"
+
 #include "FairRootManager.h"
 #include <Logger.h>
 
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
index f487e9e2f5..8dc8e96205 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMirrorSortingAlignment.h
-  * @copyright Copyright (C) 2016-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHMIRRORSORTINGALIGNMENT_H
 #define CBMRICHMIRRORSORTINGALIGNMENT_H
+
 #include "CbmRichMirror.h"
 #include "CbmRichRingFitterCOP.h"
 #include "CbmRichRingFitterEllipseTau.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
index f03c8c8fc2..cfe757328a 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMirrorSortingCorrection.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMirrorSortingCorrection.h"
+
 #include "alignment/CbmRichMirror.h"
 
 #include "FairRootManager.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
index 936acb89b4..ad322f466d 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMirrorSortingCorrection.h
-  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHMIRRORSORTINGCORRECTION_H
 #define CBMRICHMIRRORSORTINGCORRECTION_H
+
 #include "CbmHistManager.h"
 #include "CbmMCTrack.h"
 #include "CbmRichRing.h"
diff --git a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
index 28713fdbf5..a3b7ea7f10 100644
--- a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
+++ b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
@@ -1,6 +1,4 @@
-/** @file CbmRichNavigationUtil2.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef RICH_CbmRichNavigationUtil2
 #define RICH_CbmRichNavigationUtil2
 
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
index 13525a267f..dd177a5b27 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
@@ -1,8 +1,6 @@
-/** @file CbmRichPMTMapping.cxx
-  * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ---------- Original Headers ---------- //
 #include "CbmRichPMTMapping.h"
+
 #include "CbmDrawHist.h"
 #include "CbmRichHit.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.h b/reco/detectors/rich/alignment/CbmRichPMTMapping.h
index 485a063d56..a79937232e 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.h
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.h
@@ -1,9 +1,7 @@
-/** @file CbmRichPMTMapping.h
-  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMRICHPMTMAPPING_H
 #define CBMRICHPMTMAPPING_H
 
+
 #include "CbmHistManager.h"
 #include "CbmRichPoint.h"
 #include "CbmRichRecGeoPar.h"
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
index 4ab4734c16..3dc6a56c6a 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
@@ -1,8 +1,6 @@
-/** @file CbmRichProjectionProducer2.cxx
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ---------- Original Headers ---------- //
 #include "CbmRichProjectionProducer2.h"
+
 #include "CbmRichHit.h"
 
 #include "FairRootManager.h"
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
index 5e486ebddc..95753c2bb5 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
@@ -1,8 +1,6 @@
-/** @file CbmRichProjectionProducer2.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CbmRichProjectionProducer2_H
 #define CbmRichProjectionProducer2_H
+
 #include "CbmRichPoint.h"
 #include "CbmRichProjectionProducerBase.h"
 #include "CbmRichRecGeoPar.h"
diff --git a/reco/detectors/rich/alignment/CbmRichRecoQa.cxx b/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
index 01554a2a91..e6a5133f85 100644
--- a/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
+++ b/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
@@ -1,7 +1,6 @@
-/** @file CbmRichRecoQa.cxx
-  * @copyright Copyright (C) 2017-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmRichRecoQa.h"
+
 #include "CbmDrawHist.h"
 #include "CbmGlobalTrack.h"
 #include "CbmHistManager.h"
diff --git a/reco/detectors/rich/alignment/CbmRichRecoQa.h b/reco/detectors/rich/alignment/CbmRichRecoQa.h
index 063b06bc65..209e7120f0 100644
--- a/reco/detectors/rich/alignment/CbmRichRecoQa.h
+++ b/reco/detectors/rich/alignment/CbmRichRecoQa.h
@@ -1,6 +1,4 @@
-/** @file CbmRichRecoQa.h
-  * @copyright Copyright (C) 2017 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBM_RICH_RECO_QA
 #define CBM_RICH_RECO_QA
 
diff --git a/reco/detectors/rich/alignment/CbmRichUtil.h b/reco/detectors/rich/alignment/CbmRichUtil.h
index 89debbb4ba..a263df9263 100644
--- a/reco/detectors/rich/alignment/CbmRichUtil.h
+++ b/reco/detectors/rich/alignment/CbmRichUtil.h
@@ -1,6 +1,4 @@
-/** @file CbmRichUtil.h
-  * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef RICH_CbmRichUtil
 #define RICH_CbmRichUtil
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
index c05a6b2fd6..9c092bb857 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMCbmAerogelAna.cxx
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMCbmAerogelAna.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmEvent.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
index 4bdd42e1ba..4c8814d7da 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMCbmAerogelAna.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_RICH_Aerogel
 #define MCBM_RICH_Aerogel
+
 #include "CbmEvent.h"
 #include "CbmRichRingFinderHoughImpl.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index b4e107fa6c..97f60c1089 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -1,7 +1,6 @@
-/** @file CbmRichMCbmHitProducer.cxx
-  * @copyright Copyright (C) 2019-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmRichMCbmHitProducer.h"
+
 #include "CbmDigiManager.h"
 #include "CbmEvent.h"
 #include "CbmRichDetectorData.h"  // for CbmRichPmtData, CbmRichPixelData
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
index 9f7440f543..7de29fdd98 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
@@ -1,6 +1,4 @@
-/** @file CbmRichMCbmHitProducer.h
-  * @copyright Copyright (C) 2019-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 e48aef85d7..633551f8d0 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMCbmQa.cxx
-  * @copyright Copyright (C) 2017-2021 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMCbmQa.h"
+
 #include "CbmDrawHist.h"
 #include "CbmGlobalTrack.h"
 #include "CbmHistManager.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQa.h b/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
index 37d7d7ef38..65004f67bb 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMCbmQa.h
-  * @copyright Copyright (C) 2017-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_RICH_QA
 #define MCBM_RICH_QA
+
 #include "CbmHistManager.h"  // for ROOTCLING
 
 #include "FairTask.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
index a8335bf1c8..205837e4bd 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMCbmQaReal.cxx
-  * @copyright Copyright (C) 2019-2021 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMCbmQaReal.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmEvent.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
index 5d46aa05c6..83f6ad8a30 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMCbmQaReal.h
-  * @copyright Copyright (C) 2019-2020 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_RICH_QA_REAL
 #define MCBM_RICH_QA_REAL
+
 #include "CbmEvent.h"
 #include "CbmHistManager.h"  // for ROOTCLING
 #include "CbmRichRingFinderHoughImpl.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx
index be3ebdb413..223df49362 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMCbmQaRichOnly.cxx
-  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMCbmQaRichOnly.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmEvent.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
index 9c0beda474..575fd8e2e9 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMCbmQaRichOnly.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_RICH_QA_RICH_ONLY
 #define MCBM_RICH_QA_RICH_ONLY
+
 #include "CbmEvent.h"
 #include "CbmRichRingFinderHoughImpl.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
index 894c1eb10e..83f6760915 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMCbmSEDisplay.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMCbmSEDisplay.h"
+
 #include "CbmRichHit.h"
 #include "CbmRichRing.h"
 #include "CbmTofTracklet.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
index 7fd85adb71..10f795c730 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMCbmSEDisplay.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_RICH_SE_DISPLAY
 #define MCBM_RICH_SE_DISPLAY
+
 #include "CbmEvent.h"
 #include "CbmHistManager.h"  // for ROOTCLING
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
index 9432ad4080..8b9623d7ad 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichMCbmToTShifter.cxx
-  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichMCbmToTShifter.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmHistManager.h"
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
index eda2a07d3b..6280ba0788 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
@@ -1,8 +1,6 @@
-/** @file CbmRichMCbmToTShifter.h
-  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef MCBM_RICH_TOTSHIFTER
 #define MCBM_RICH_TOTSHIFTER
+
 #include "FairTask.h"
 class CbmMcbm2018RichPar;
 class TClonesArray;
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.cxx b/reco/detectors/rich/qa/CbmRichRecoQa.cxx
index fc8b57bb31..d85e6c8138 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.cxx
@@ -1,7 +1,6 @@
-/** @file CbmRichRecoQa.cxx
-  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmRichRecoQa.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmGlobalTrack.h"
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.h b/reco/detectors/rich/qa/CbmRichRecoQa.h
index 982c96d4a4..f0b8803604 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.h
@@ -1,6 +1,4 @@
-/** @file CbmRichRecoQa.h
-  * @copyright Copyright (C) 2016-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #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 320165eb31..db6b4d4a04 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichRecoTbQa.cxx
-  * @copyright Copyright (C) 2018-2021 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichRecoTbQa.h"
+
 #include "CbmDigiManager.h"
 #include "CbmDrawHist.h"
 #include "CbmGlobalTrack.h"
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.h b/reco/detectors/rich/qa/CbmRichRecoTbQa.h
index 3549ab465b..1e5c695332 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.h
@@ -1,6 +1,4 @@
-/** @file CbmRichRecoTbQa.h
-  * @copyright Copyright (C) 2018-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef CBM_RICH_RECO_TB_QA
 #define CBM_RICH_RECO_TB_QA
 
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h b/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h
index 0098bad08d..b5860687f0 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h
+++ b/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRichMirrorsLinkDef.h
-  * @copyright Copyright (C) 2019 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx
index eaaf23e9fb..a72322dfac 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx
+++ b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichRonchiAna.cxx
-  * @copyright Copyright (C) 2018-2019 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichRonchiAna.h"
+
 #include <boost/gil/extension/io/tiff.hpp>
 #include <boost/gil/gil_all.hpp>
 //#include <boost/gil/extension/io/tiff_dynamic_io.hpp>
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
index 0d7e767000..f426ff911e 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
+++ b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
@@ -1,8 +1,6 @@
-/** @file CbmRichRonchiAna.h
-  * @copyright Copyright (C) 2018-2019 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef RICH_MIRRORS_CBMRICHRONCHIANA_H_
 #define RICH_MIRRORS_CBMRICHRONCHIANA_H_
+
 #include "TObject.h"
 #include "TVector3.h"
 
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx b/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
index 18b008900d..31582230b1 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
+++ b/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRichRingSelectAnn.cxx
-  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRichRingSelectAnn.h"
+
 #include "CbmRichGeoManager.h"
 #include "CbmRichRingLight.h"
 #include "CbmRichRingSelectImpl.h"
diff --git a/reco/detectors/rich/utils/CbmRichNavigationUtil.h b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
index b84ddfb5fc..afe3b1ce9a 100644
--- a/reco/detectors/rich/utils/CbmRichNavigationUtil.h
+++ b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
@@ -1,6 +1,4 @@
-/** @file CbmRichNavigationUtil.h
-  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef RICH_CbmRichNavigationUtil
 #define RICH_CbmRichNavigationUtil
 
diff --git a/reco/detectors/rich/utils/CbmRichUtil.h b/reco/detectors/rich/utils/CbmRichUtil.h
index edd9ab58d6..3467b330d5 100644
--- a/reco/detectors/rich/utils/CbmRichUtil.h
+++ b/reco/detectors/rich/utils/CbmRichUtil.h
@@ -1,6 +1,4 @@
-/** @file CbmRichUtil.h
-  * @copyright Copyright (C) 2017-2019 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #ifndef RICH_CbmRichUtil
 #define RICH_CbmRichUtil
 
diff --git a/reco/detectors/rich/utils/hadd.C b/reco/detectors/rich/utils/hadd.C
index e2333e4041..3960f70da6 100644
--- a/reco/detectors/rich/utils/hadd.C
+++ b/reco/detectors/rich/utils/hadd.C
@@ -1,6 +1,3 @@
-/** @file hadd.C
-  * @copyright Copyright (C) 2011 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "TChain.h"
 #include "TFile.h"
 #include "TH1.h"
diff --git a/reco/detectors/sts/CbmRecoStsLinkDef.h b/reco/detectors/sts/CbmRecoStsLinkDef.h
index e493eee209..ef0a4fb575 100644
--- a/reco/detectors/sts/CbmRecoStsLinkDef.h
+++ b/reco/detectors/sts/CbmRecoStsLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRecoStsLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/tof/CbmTofRecoLinkDef.h b/reco/detectors/tof/CbmTofRecoLinkDef.h
index 3505d49cf3..2bd8577c2c 100644
--- a/reco/detectors/tof/CbmTofRecoLinkDef.h
+++ b/reco/detectors/tof/CbmTofRecoLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTofRecoLinkDef.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.cxx b/reco/detectors/tof/CbmTofTBClusterizer.cxx
index 7126c97b76..8064244666 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTBClusterizer.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 50a63a2e71..32aa46d707 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -1,6 +1,3 @@
-/** @file CbmTofTrackFinderNN.cxx
-  * @copyright Copyright (C) 2015-2021 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // ROOT Classes and includes
 #include "TClonesArray.h"
 #include "TDirectory.h"
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.h b/reco/detectors/tof/CbmTofTrackFinderNN.h
index f5a1207a78..76ad88b97d 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.h
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.h
@@ -1,6 +1,3 @@
-/** @file CbmTofTrackFinderNN.h
-  * @copyright Copyright (C) 2015-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /**
 nh, adapt from 
  * \file CbmTrdTrackFinderIdeal.h
diff --git a/reco/detectors/tof/LKFMinuit.cxx b/reco/detectors/tof/LKFMinuit.cxx
index 96d0263f91..3b471ae9a5 100644
--- a/reco/detectors/tof/LKFMinuit.cxx
+++ b/reco/detectors/tof/LKFMinuit.cxx
@@ -1,7 +1,5 @@
-/** @file LKFMinuit.cxx
-  * @copyright Copyright (C) 2015-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "LKFMinuit.h"
+
 #include <Logger.h>
 
 #include <TFitter.h>
diff --git a/reco/detectors/tof/LKFMinuit.h b/reco/detectors/tof/LKFMinuit.h
index 9aa4beca0f..0930a4183b 100644
--- a/reco/detectors/tof/LKFMinuit.h
+++ b/reco/detectors/tof/LKFMinuit.h
@@ -1,8 +1,6 @@
-/** @file LKFMinuit.h
-  * @copyright Copyright (C) 2015-2020 PI-UHd,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LKFMinuit_h
 #define LKFMinuit_h
+
 #include "TFitter.h"
 #include "TMath.h"
 #include "TMinuit.h"
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index 4a545b4b8c..1e8f085486 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdClusterFinder.cxx
-  * @copyright Copyright (C) 2010-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdClusterFinder.h"
+
 #include "CbmDefs.h"
 #include "CbmDigiManager.h"
 #include "CbmTrdCluster.h"
diff --git a/reco/detectors/trd/CbmTrdHitProducer.cxx b/reco/detectors/trd/CbmTrdHitProducer.cxx
index da35b5e5e5..bb2fd35051 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.cxx
+++ b/reco/detectors/trd/CbmTrdHitProducer.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdHitProducer.cxx
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdHitProducer.h"
+
 #include "CbmDefs.h"
 #include "CbmDigiManager.h"
 #include "CbmTrdAddress.h"
diff --git a/reco/detectors/trd/CbmTrdModuleRec.cxx b/reco/detectors/trd/CbmTrdModuleRec.cxx
index fe4b1bee7e..2785b8f7de 100644
--- a/reco/detectors/trd/CbmTrdModuleRec.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdModuleRec.cxx
-  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdModuleRec.h"
+
 #include <TClonesArray.h>
 
 //_______________________________________________________________________________
diff --git a/reco/detectors/trd/CbmTrdModuleRec.h b/reco/detectors/trd/CbmTrdModuleRec.h
index 4e7593dd78..83b0687bed 100644
--- a/reco/detectors/trd/CbmTrdModuleRec.h
+++ b/reco/detectors/trd/CbmTrdModuleRec.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleRec.h
-  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMODULEREC_H
 #define CBMTRDMODULEREC_H
+
 #include "CbmTrdModuleAbstract.h"
 
 #include <map>
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.cxx b/reco/detectors/trd/CbmTrdModuleRecR.cxx
index 8d425c408c..b62b9b52ab 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecR.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdModuleRecR.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdModuleRecR.h"
+
 #include "CbmDigiManager.h"
 #include "CbmTrdAddress.h"
 #include "CbmTrdCluster.h"
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.h b/reco/detectors/trd/CbmTrdModuleRecR.h
index 0abe7d9431..f7700c6b20 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.h
+++ b/reco/detectors/trd/CbmTrdModuleRecR.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleRecR.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMODULERECR_H
 #define CBMTRDMODULERECR_H
+
 #include "CbmTrdModuleRec.h"
 
 #include <deque>
diff --git a/reco/detectors/trd/CbmTrdModuleRecT.cxx b/reco/detectors/trd/CbmTrdModuleRecT.cxx
index 70cf0c9045..11f0c89686 100644
--- a/reco/detectors/trd/CbmTrdModuleRecT.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecT.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdModuleRecT.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdModuleRecT.h"
+
 #include "CbmTrdCluster.h"
 #include "CbmTrdDigi.h"
 #include "CbmTrdFASP.h"
diff --git a/reco/detectors/trd/CbmTrdModuleRecT.h b/reco/detectors/trd/CbmTrdModuleRecT.h
index b43dd6a33d..6a5dfa8c51 100644
--- a/reco/detectors/trd/CbmTrdModuleRecT.h
+++ b/reco/detectors/trd/CbmTrdModuleRecT.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleRecT.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMODULERECT_H
 #define CBMTRDMODULERECT_H
+
 #include "CbmTrdModuleRec.h"
 
 #include <list>
diff --git a/reco/detectors/trd/CbmTrdRecoLinkDef.h b/reco/detectors/trd/CbmTrdRecoLinkDef.h
index 11b4589e9f..d7868faf16 100644
--- a/reco/detectors/trd/CbmTrdRecoLinkDef.h
+++ b/reco/detectors/trd/CbmTrdRecoLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTrdRecoLinkDef.h
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: TrdRecoLinkDef.h $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
index 4fdf4ab632..ce01dabe28 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
@@ -1,7 +1,6 @@
-/** @file CbmTrdElectronsTrainAnn.cxx
-  * @copyright Copyright (C) 2009-2021 UGiessen,JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 #include "CbmTrdElectronsTrainAnn.h"
+
 #include "CbmDrawHist.h"
 #include "CbmMCTrack.h"
 #include "CbmTrackMatchNew.h"
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
index f6971ccbfc..4bf3c662b2 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidModWkn source file          -----
 // -----                                  -----
diff --git a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
index defa124452..8faba0492e 100644
--- a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
+++ b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdClusterizerFastQa.h
-  * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDCLUSTERIZERFASTQA_H
 #define CBMTRDCLUSTERIZERFASTQA_H 1
+
 #include "FairTask.h"
 
 class TClonesArray;
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
index 91e04b6fdf..d5a0bf7c1c 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdHitDensityQa.cxx
-  * @copyright Copyright (C) 2011-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdHitDensityQa.h"
+
 #include "CbmDigiManager.h"
 #include "CbmTrdCluster.h"
 #include "CbmTrdDigi.h"
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.h b/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
index 7fd6a31c5f..458368bead 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdHitDensityQa.h
-  * @copyright Copyright (C) 2011-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDHITDENSITYQA_H_
 #define CBMTRDHITDENSITYQA_H_
+
 #include "FairTask.h"
 
 // #include "CbmTrdDigitizerMathieson.h"
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
index bfd8ccad72..1f65adb5e5 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdHitProducerClusterQa.h
-  * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDHITPRODUCERCLUSTERQA_H
 #define CBMTRDHITPRODUCERCLUSTERQA_H 1
+
 #include "FairTask.h"
 
 class TClonesArray;
diff --git a/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx b/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
index c8673f1691..1b77358e2f 100644
--- a/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdOccupancyQa.cxx
-  * @copyright Copyright (C) 2012-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdOccupancyQa.h"
+
 #include "CbmDigiManager.h"
 #include "CbmTrdAddress.h"
 #include "CbmTrdCluster.h"
diff --git a/reco/detectors/trd/qa/CbmTrdOccupancyQa.h b/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
index 2303bacb7b..666a8a8757 100644
--- a/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
+++ b/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdOccupancyQa.h
-  * @copyright Copyright (C) 2012-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDOCCUPANCYQA_H_
 #define CBMTRDOCCUPANCYQA_H_
+
 #include "FairTask.h"
 
 #include <list>
diff --git a/reco/detectors/trd/qa/CbmTrdQa.cxx b/reco/detectors/trd/qa/CbmTrdQa.cxx
index 630a0adcd4..6048116c91 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdQa.cxx
-  * @copyright Copyright (C) 2012-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdQa.h"
+
 #include "CbmDigiManager.h"
 #include "CbmMCTrack.h"
 #include "CbmTrdCluster.h"
diff --git a/reco/detectors/trd/qa/CbmTrdQa.h b/reco/detectors/trd/qa/CbmTrdQa.h
index e1a0bab40a..7021f668f3 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.h
+++ b/reco/detectors/trd/qa/CbmTrdQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdQa.h
-  * @copyright Copyright (C) 2012-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDQA_H
 #define CBMTRDQA_H
+
 #include "FairTask.h"
 
 #include <map>
diff --git a/reco/eventbuilder/CbmEventBuilderLinkDef.h b/reco/eventbuilder/CbmEventBuilderLinkDef.h
index c460fc6622..1f6d5431ab 100644
--- a/reco/eventbuilder/CbmEventBuilderLinkDef.h
+++ b/reco/eventbuilder/CbmEventBuilderLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmEventBuilderLinkDef.h
-  * @copyright Copyright (C) 2017-2021 IKF-UFra,GSI
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.cxx b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
index 33ed7ab9cb..a3b8413692 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.cxx
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
@@ -1,7 +1,5 @@
-/** @file CbmEvBuildSource.cxx
-  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmEvBuildSource.h"
+
 #include "CbmDigi.h"
 #include "CbmStsAddress.h"
 #include "CbmStsDigi.h"
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.h b/reco/eventbuilder/digis/CbmEvBuildSource.h
index e72a6c58da..c88f3e4142 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.h
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.h
@@ -1,6 +1,3 @@
-/** @file CbmEvBuildSource.h
-  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // FairSource which reads a time slice and creates events using a simple approach
 // Use the same approach as CbmBuildEventSimple
 // //Dr.Sys : mikhail.prokudin@cern.ch
diff --git a/reco/global/CbmEcalTrackingMuch.cxx b/reco/global/CbmEcalTrackingMuch.cxx
index 9612f128ce..f88a1d4f9b 100644
--- a/reco/global/CbmEcalTrackingMuch.cxx
+++ b/reco/global/CbmEcalTrackingMuch.cxx
@@ -1,7 +1,5 @@
-/** @file CbmEcalTrackingMuch.cxx
-  * @copyright Copyright (C) 2011-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmEcalTrackingMuch.h"
+
 #include "CbmEcalInf.h"
 #include "CbmEcalStructure.h"
 #include "CbmStsKFTrackFitter.h"
diff --git a/reco/global/CbmEcalTrackingMuch.h b/reco/global/CbmEcalTrackingMuch.h
index f5fb0c736e..e3fee11d1f 100644
--- a/reco/global/CbmEcalTrackingMuch.h
+++ b/reco/global/CbmEcalTrackingMuch.h
@@ -1,8 +1,6 @@
-/** @file CbmEcalTrackingMuch.h
-  * @copyright Copyright (C) 2011-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMECALTRACKINGMUCH_H
 #define CBMECALTRACKINGMUCH_H
+
 #include "FairTask.h"
 
 #include "TString.h"
diff --git a/reco/global/CbmGlobalLinkDef.h b/reco/global/CbmGlobalLinkDef.h
index bd6e272e2b..9a215520ca 100644
--- a/reco/global/CbmGlobalLinkDef.h
+++ b/reco/global/CbmGlobalLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmGlobalLinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/littrack/LittrackLinkDef.h b/reco/littrack/LittrackLinkDef.h
index 2e3bda8cc6..c74300d94f 100644
--- a/reco/littrack/LittrackLinkDef.h
+++ b/reco/littrack/LittrackLinkDef.h
@@ -1,7 +1,5 @@
-/** @file LittrackLinkDef.h
-  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
index c339e65c3d..08ff43341a 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitCreateStandaloneData.cxx
-  * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "qa/CbmLitCreateStandaloneData.h"
+
 #include "CbmMuchPixelHit.h"
 #include "CbmStsTrack.h"
 
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
index 731de5cfef..00a28e75a0 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
@@ -1,8 +1,6 @@
-/** @file CbmLitCreateStandaloneData.h
-  * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITCREATESTANDALONEDATA_H_
 #define CBMLITCREATESTANDALONEDATA_H_
+
 #include "FairTask.h"
 
 #include <fstream>
diff --git a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
index be233e7f30..d604f4ce2e 100644
--- a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
+++ b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitTestMatrixMath.cxx
-  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "qa/CbmLitTestMatrixMath.h"
+
 #include "utils/CbmLitMatrixMath.h"
 
 #include "TMatrixT.h"
diff --git a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
index cc4c70b7c8..28185abb79 100644
--- a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
+++ b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
@@ -1,8 +1,6 @@
-/** @file CbmLitTestMatrixMath.h
-  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITTESTMATRIXMATH_H_
 #define CBMLITTESTMATRIXMATH_H_
+
 #include "base/CbmLitFloat.h"
 
 #include <string>
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
index ccee08e273..827f2c9537 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitCheckBrem.cxx
-  * @copyright Copyright (C) 2009-2021 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "qa/material/CbmLitCheckBrem.h"
+
 #include "data/CbmLitTrackParam.h"
 #include "propagation/CbmLitMaterialEffectsImp.h"
 #include "propagation/CbmLitMaterialInfo.h"
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
index 65dae5bea6..b34130fdfb 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
@@ -1,8 +1,6 @@
-/** @file CbmLitCheckBrem.h
-  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITCHECKBREM_H_
 #define CBMLITCHECKBREM_H_
+
 #include "TObject.h"
 
 #include <string>
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
index 16eb53efd7..1d556a31a9 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitCheckEnergyLossMuons.cxx
-  * @copyright Copyright (C) 2009-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "qa/material/CbmLitCheckEnergyLossMuons.h"
+
 #include "CbmDrawHist.h"
 #include "CbmUtils.h"
 #include "data/CbmLitTrackParam.h"
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
index b87e04784f..bef8fe9b5a 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
@@ -1,8 +1,6 @@
-/** @file CbmLitCheckEnergyLossMuons.h
-  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITCHECKENERGYLOSSMUONS_H_
 #define CBMLITCHECKENERGYLOSSMUONS_H_
+
 #include "FairTask.h"
 
 #include <string>
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
index 3000401d52..4c617e75de 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitRadLengthGenerator.cxx
-  * @copyright Copyright (C) 2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmLitRadLengthGenerator.h"
+
 #include "FairPrimaryGenerator.h"
 
 CbmLitRadLengthGenerator::CbmLitRadLengthGenerator() : FairGenerator(), fX(), fY() {}
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
index d4dc347019..04485b2d90 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
@@ -1,8 +1,6 @@
-/** @file CbmLitRadLengthGenerator.h
-  * @copyright Copyright (C) 2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITRADLENGTHGENERATOR_H_
 #define CBMLITRADLENGTHGENERATOR_H_
+
 #include "FairGenerator.h"
 
 #include <vector>
diff --git a/reco/littrack/cbm/utils/CbmLitConverter.h b/reco/littrack/cbm/utils/CbmLitConverter.h
index 990ff6b8d2..ab7d4ce1ce 100644
--- a/reco/littrack/cbm/utils/CbmLitConverter.h
+++ b/reco/littrack/cbm/utils/CbmLitConverter.h
@@ -1,8 +1,6 @@
-/** @file CbmLitConverter.h
-  * @copyright Copyright (C) 2008-2020 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITCONVERTER_H_
 #define CBMLITCONVERTER_H_
+
 #include "CbmEvent.h"
 #include "CbmGlobalTrack.h"
 #include "CbmHit.h"
diff --git a/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h b/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
index 3b6b41db78..21bcac76b7 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
+++ b/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
@@ -1,8 +1,6 @@
-/** @file CbmLitConverterFairTrackParam.h
-  * @copyright Copyright (C) 2016-2017 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITCONVERTERFAIRTRACKPARAM_H_
 #define CBMLITCONVERTERFAIRTRACKPARAM_H_
+
 #include "base/CbmLitEnums.h"
 #include "base/CbmLitTypes.h"
 
diff --git a/reco/littrack/clustering/CbmClusteringLinkDef.h b/reco/littrack/clustering/CbmClusteringLinkDef.h
index d9d837bdf2..f58f17a8de 100644
--- a/reco/littrack/clustering/CbmClusteringLinkDef.h
+++ b/reco/littrack/clustering/CbmClusteringLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmClusteringLinkDef.h
-  * @copyright Copyright (C) 2012-2014 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/littrack/cuda/CudaTest.h b/reco/littrack/cuda/CudaTest.h
index ceb8a758ed..38dea20ec3 100644
--- a/reco/littrack/cuda/CudaTest.h
+++ b/reco/littrack/cuda/CudaTest.h
@@ -1,8 +1,6 @@
-/** @file CudaTest.h
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CUDATEST_H_
 #define CUDATEST_H_
+
 #include "TObject.h"
 
 #include "LitCudaTest.h"
diff --git a/reco/littrack/cuda/LitCudaHit.h b/reco/littrack/cuda/LitCudaHit.h
index 8fc174e793..ace3f50f08 100644
--- a/reco/littrack/cuda/LitCudaHit.h
+++ b/reco/littrack/cuda/LitCudaHit.h
@@ -1,8 +1,6 @@
-/** @file LitCudaHit.h
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LITCUDAHIT_H_
 #define LITCUDAHIT_H_
+
 #include <iostream>
 
 struct LitCudaStripHit {
diff --git a/reco/littrack/cuda/LitCudaMaterialInfo.h b/reco/littrack/cuda/LitCudaMaterialInfo.h
index 25f6f0602b..81b7dfd8d0 100644
--- a/reco/littrack/cuda/LitCudaMaterialInfo.h
+++ b/reco/littrack/cuda/LitCudaMaterialInfo.h
@@ -1,8 +1,6 @@
-/** @file LitCudaMaterialInfo.h
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LITCUDAMATERIALINFO_H_
 #define LITCUDAMATERIALINFO_H_
+
 #include <iostream>
 
 struct LitCudaMaterialInfo {
diff --git a/reco/littrack/cuda/LitCudaTest.cxx b/reco/littrack/cuda/LitCudaTest.cxx
index f4efbca60e..2541dede84 100644
--- a/reco/littrack/cuda/LitCudaTest.cxx
+++ b/reco/littrack/cuda/LitCudaTest.cxx
@@ -1,7 +1,5 @@
-/** @file LitCudaTest.cxx
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "LitCudaTest.h"
+
 #include <cstdlib>
 
 #include <cuda.h>
diff --git a/reco/littrack/cuda/LitCudaTest.h b/reco/littrack/cuda/LitCudaTest.h
index 2d96d380f3..4272230b6f 100644
--- a/reco/littrack/cuda/LitCudaTest.h
+++ b/reco/littrack/cuda/LitCudaTest.h
@@ -1,8 +1,6 @@
-/** @file LitCudaTest.h
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LITCUDATEST_H_
 #define LITCUDATEST_H_
+
 class LitCudaTest {
 public:
   LitCudaTest();
diff --git a/reco/littrack/cuda/LitCudaTrack.h b/reco/littrack/cuda/LitCudaTrack.h
index 4220f7b5e0..c61ae29dea 100644
--- a/reco/littrack/cuda/LitCudaTrack.h
+++ b/reco/littrack/cuda/LitCudaTrack.h
@@ -1,8 +1,6 @@
-/** @file LitCudaTrack.h
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LITCUDATRACK_H_
 #define LITCUDATRACK_H_
+
 //#include "LitTypes.h"
 #include <iostream>
 
diff --git a/reco/littrack/cuda/LitCudaTrackParam.h b/reco/littrack/cuda/LitCudaTrackParam.h
index 9f7e65f09f..7cdb7f635e 100644
--- a/reco/littrack/cuda/LitCudaTrackParam.h
+++ b/reco/littrack/cuda/LitCudaTrackParam.h
@@ -1,8 +1,6 @@
-/** @file LitCudaTrackParam.h
-  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LITCUDATRACKPARAM_H_
 #define LITCUDATRACKPARAM_H_ 1
+
 #include <iostream>
 
 struct LitCudaTrackParam {
diff --git a/reco/littrack/cuda/LitCudaTypes.h b/reco/littrack/cuda/LitCudaTypes.h
index 311ae2de97..f7b9a56b95 100644
--- a/reco/littrack/cuda/LitCudaTypes.h
+++ b/reco/littrack/cuda/LitCudaTypes.h
@@ -1,8 +1,6 @@
-/** @file LitCudaTypes.h
-  * @copyright Copyright (C) 2010 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LITCUDATYPES_H_
 #define LITCUDATYPES_H_
+
 //enum LitCudaHitType { kLITSTRIPHIT = 0, kLITPIXELHIT = 1, kLITMIXHIT = 2};
 
 const unsigned char LITCUDASTRIPHIT = 0;
diff --git a/reco/littrack/parallel/vectors/P4_F32vec4.h b/reco/littrack/parallel/vectors/P4_F32vec4.h
index f02b73b1e7..02cf3d4dd5 100644
--- a/reco/littrack/parallel/vectors/P4_F32vec4.h
+++ b/reco/littrack/parallel/vectors/P4_F32vec4.h
@@ -1,9 +1,7 @@
-/** @file P4_F32vec4.h
-  * @copyright Copyright (C) 2010-2014 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LIT_F32VEC4P4_H
 #define LIT_F32VEC4P4_H
 
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h b/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h
index 44d558cbd7..ef34b03546 100644
--- a/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h
+++ b/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h
@@ -1,8 +1,6 @@
-/** @file PSEUDO_F32vec1.h
-  * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LIT_F32VEC1_H
 #define LIT_F32VEC1_H
+
 #include <iostream>
 
 #include <cmath>
diff --git a/reco/littrack/parallel/vectors/vec_arithmetic.h b/reco/littrack/parallel/vectors/vec_arithmetic.h
index b37cbc7fd6..8fb0b05bb7 100644
--- a/reco/littrack/parallel/vectors/vec_arithmetic.h
+++ b/reco/littrack/parallel/vectors/vec_arithmetic.h
@@ -1,8 +1,6 @@
-/** @file vec_arithmetic.h
-  * @copyright Copyright (C) 2010-2014 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef LIT_VEC_ARITHMETIC_H
 #define LIT_VEC_ARITHMETIC_H
+
 /* Define all operators after definition of  basic operators */
 
 #define vec_arithmetic(V, S)                                                                                           \
diff --git a/reco/littrack/std/utils/CbmLitComparators.h b/reco/littrack/std/utils/CbmLitComparators.h
index 9d62fe5536..3b5f3871d7 100644
--- a/reco/littrack/std/utils/CbmLitComparators.h
+++ b/reco/littrack/std/utils/CbmLitComparators.h
@@ -1,8 +1,6 @@
-/** @file CbmLitComparators.h
-  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITCOMPARATORS_H_
 #define CBMLITCOMPARATORS_H_
+
 #include "data/CbmLitHit.h"
 #include "data/CbmLitPixelHit.h"
 #include "data/CbmLitStripHit.h"
diff --git a/reco/littrack/std/utils/CbmLitMath.cxx b/reco/littrack/std/utils/CbmLitMath.cxx
index 9949c69374..7f5a70ec1b 100644
--- a/reco/littrack/std/utils/CbmLitMath.cxx
+++ b/reco/littrack/std/utils/CbmLitMath.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitMath.cxx
-  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "utils/CbmLitMath.h"
+
 #include "data/CbmLitHit.h"
 #include "data/CbmLitPixelHit.h"
 #include "data/CbmLitStripHit.h"
diff --git a/reco/littrack/std/utils/CbmLitMath.h b/reco/littrack/std/utils/CbmLitMath.h
index 35a03f0dbb..86d679dbf9 100644
--- a/reco/littrack/std/utils/CbmLitMath.h
+++ b/reco/littrack/std/utils/CbmLitMath.h
@@ -1,8 +1,6 @@
-/** @file CbmLitMath.h
-  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITMATH_H_
 #define CBMLITMATH_H_
+
 #include "data/CbmLitTrackParam.h"
 
 class CbmLitHit;
diff --git a/reco/littrack/std/utils/CbmLitMatrixMath.cxx b/reco/littrack/std/utils/CbmLitMatrixMath.cxx
index f555f39431..2e171dd2ea 100644
--- a/reco/littrack/std/utils/CbmLitMatrixMath.cxx
+++ b/reco/littrack/std/utils/CbmLitMatrixMath.cxx
@@ -1,7 +1,5 @@
-/** @file CbmLitMatrixMath.cxx
-  * @copyright Copyright (C) 2009-2017 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "utils/CbmLitMatrixMath.h"
+
 #include <iostream>
 
 /*
diff --git a/reco/littrack/std/utils/CbmLitMatrixMath.h b/reco/littrack/std/utils/CbmLitMatrixMath.h
index 68c503b83d..1244acc066 100644
--- a/reco/littrack/std/utils/CbmLitMatrixMath.h
+++ b/reco/littrack/std/utils/CbmLitMatrixMath.h
@@ -1,8 +1,6 @@
-/** @file CbmLitMatrixMath.h
-  * @copyright Copyright (C) 2009-2017 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITMATRIXMATH_H_
 #define CBMLITMATRIXMATH_H_
+
 #include "base/CbmLitFloat.h"
 
 #include <vector>
diff --git a/reco/littrack/std/utils/CbmLitMemoryManagment.h b/reco/littrack/std/utils/CbmLitMemoryManagment.h
index d8b4a9d234..d9517a9103 100644
--- a/reco/littrack/std/utils/CbmLitMemoryManagment.h
+++ b/reco/littrack/std/utils/CbmLitMemoryManagment.h
@@ -1,9 +1,7 @@
-/** @file CbmLitMemoryManagment.h
-  * @copyright Copyright (C) 2008-2011 GSI/JINR-LIT
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMLITMEMORYMANAGMENT_H_
 #define CBMLITMEMORYMANAGMENT_H_
 
+
 class DeleteObject {
 public:
   template<typename T>
diff --git a/reco/qa/RecoQaLinkDef.h b/reco/qa/RecoQaLinkDef.h
index d30656ff06..9c5bbaab7a 100644
--- a/reco/qa/RecoQaLinkDef.h
+++ b/reco/qa/RecoQaLinkDef.h
@@ -1,7 +1,5 @@
-/** @file RecoQaLinkDef.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 
 #pragma link off all classes;
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
index 230e6cbddd..36146e5630 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
index 53eb555616..509ff9eb0c 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
index 6a8085358f..b388df4875 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
index 8f4be47bd1..08bf2ea207 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
index 7b130d6fa0..f72b0227c6 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/CbmTrackParam2.cxx b/reco/tracking/BinnedTracker/CbmTrackParam2.cxx
index b76cde73e3..fef83c1f5c 100644
--- a/reco/tracking/BinnedTracker/CbmTrackParam2.cxx
+++ b/reco/tracking/BinnedTracker/CbmTrackParam2.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/CbmTrackParam2.h b/reco/tracking/BinnedTracker/CbmTrackParam2.h
index 849c6dfb47..a02272fbf4 100644
--- a/reco/tracking/BinnedTracker/CbmTrackParam2.h
+++ b/reco/tracking/BinnedTracker/CbmTrackParam2.h
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/ContFactory.cxx b/reco/tracking/BinnedTracker/ContFactory.cxx
index 923d2bf065..4639ee5b29 100644
--- a/reco/tracking/BinnedTracker/ContFactory.cxx
+++ b/reco/tracking/BinnedTracker/ContFactory.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/GeoReader.cxx b/reco/tracking/BinnedTracker/GeoReader.cxx
index 538927de9c..eceb604ebb 100644
--- a/reco/tracking/BinnedTracker/GeoReader.cxx
+++ b/reco/tracking/BinnedTracker/GeoReader.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/HitReader.cxx b/reco/tracking/BinnedTracker/HitReader.cxx
index f9e5535b36..289e8dbacf 100644
--- a/reco/tracking/BinnedTracker/HitReader.cxx
+++ b/reco/tracking/BinnedTracker/HitReader.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/Settings.cxx b/reco/tracking/BinnedTracker/Settings.cxx
index 38d6299b4d..cc70817f0f 100644
--- a/reco/tracking/BinnedTracker/Settings.cxx
+++ b/reco/tracking/BinnedTracker/Settings.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/Station.cxx b/reco/tracking/BinnedTracker/Station.cxx
index 031d42b891..4ebeb8a642 100644
--- a/reco/tracking/BinnedTracker/Station.cxx
+++ b/reco/tracking/BinnedTracker/Station.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/Station3D.cxx b/reco/tracking/BinnedTracker/Station3D.cxx
index 0b8c0f7e07..7a01e671ac 100644
--- a/reco/tracking/BinnedTracker/Station3D.cxx
+++ b/reco/tracking/BinnedTracker/Station3D.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/Station4D.cxx b/reco/tracking/BinnedTracker/Station4D.cxx
index 590349a15a..801efda583 100644
--- a/reco/tracking/BinnedTracker/Station4D.cxx
+++ b/reco/tracking/BinnedTracker/Station4D.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/BinnedTracker/Tracker.cxx b/reco/tracking/BinnedTracker/Tracker.cxx
index 7aaf95c16c..407fcc3119 100644
--- a/reco/tracking/BinnedTracker/Tracker.cxx
+++ b/reco/tracking/BinnedTracker/Tracker.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.cxx b/reco/tracking/global/CbmGlobalTrackingQA.cxx
index 7230910b15..f7e1564fd1 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingQA.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/global/CbmGlobalTrackingTask.cxx b/reco/tracking/global/CbmGlobalTrackingTask.cxx
index 934643b890..e81eaddb57 100644
--- a/reco/tracking/global/CbmGlobalTrackingTask.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTask.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/global/CbmGlobalTrackingTof.cxx b/reco/tracking/global/CbmGlobalTrackingTof.cxx
index 650210f611..330beefc75 100644
--- a/reco/tracking/global/CbmGlobalTrackingTof.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTof.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/global/GlobalLinkDef.h b/reco/tracking/global/GlobalLinkDef.h
index 4e0180d0be..48962db417 100644
--- a/reco/tracking/global/GlobalLinkDef.h
+++ b/reco/tracking/global/GlobalLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/reco/tracking/lx/CalcStats/CalcStats.cxx b/reco/tracking/lx/CalcStats/CalcStats.cxx
index c90820b3d7..2b63dfebb7 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.cxx
+++ b/reco/tracking/lx/CalcStats/CalcStats.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CalcStats.h"
+
 #include "CbmMCTrack.h"
 #include "CbmMuchGeoScheme.h"
 #include "CbmMuchPoint.h"
diff --git a/reco/tracking/lx/CalcStats/CalcStats.h b/reco/tracking/lx/CalcStats/CalcStats.h
index 07c613d0a3..f69111fb90 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.h
+++ b/reco/tracking/lx/CalcStats/CalcStats.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LX_CALC_STATS
 #define LX_CALC_STATS
+
 #include "FairTask.h"
 
 #include "TH1F.h"
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
index de83f32688..41929e308e 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "GenNoiseElectrons.h"
+
 #include "CbmMCTrack.h"
 #include "CbmMuchGeoScheme.h"
 #include "CbmMuchPoint.h"
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
index 4b2ee21f0b..514b644f22 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LX_GEN_NOISE_ELECTRONS
 #define LX_GEN_NOISE_ELECTRONS
+
 #include "FairTask.h"
 
 class LxGenNoiseElectrons : public FairTask {
diff --git a/reco/tracking/lx/LxLinkDef.h b/reco/tracking/lx/LxLinkDef.h
index 6cd7112bd0..28437377ad 100644
--- a/reco/tracking/lx/LxLinkDef.h
+++ b/reco/tracking/lx/LxLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/reco/tracking/lx/Simple/Lx.cxx b/reco/tracking/lx/Simple/Lx.cxx
index 101f368070..a0c8324d4a 100644
--- a/reco/tracking/lx/Simple/Lx.cxx
+++ b/reco/tracking/lx/Simple/Lx.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "Lx.h"
+
 #include "CbmKFParticle.h"
 #include "CbmKFTrack.h"
 #include "CbmMCTrack.h"
diff --git a/reco/tracking/lx/Simple/Lx.h b/reco/tracking/lx/Simple/Lx.h
index 1692fe4f97..b17c174d3d 100644
--- a/reco/tracking/lx/Simple/Lx.h
+++ b/reco/tracking/lx/Simple/Lx.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LX_INCLUDED
 #define LX_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "CbmMuchPixelHit.h"
diff --git a/reco/tracking/lx/Simple/LxCA.cxx b/reco/tracking/lx/Simple/LxCA.cxx
index d76f5cb2b9..ec4be739e0 100644
--- a/reco/tracking/lx/Simple/LxCA.cxx
+++ b/reco/tracking/lx/Simple/LxCA.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxCA.h"
+
 #include <iostream>
 
 #include "Lx.h"
diff --git a/reco/tracking/lx/Simple/LxCA.h b/reco/tracking/lx/Simple/LxCA.h
index ed1b5a5e3c..dd94b2c727 100644
--- a/reco/tracking/lx/Simple/LxCA.h
+++ b/reco/tracking/lx/Simple/LxCA.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXCA_INCLUDED
 #define LXCA_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "Rtypes.h"
diff --git a/reco/tracking/lx/Simple/LxDraw.cxx b/reco/tracking/lx/Simple/LxDraw.cxx
index 1152ee150d..a10797eb83 100644
--- a/reco/tracking/lx/Simple/LxDraw.cxx
+++ b/reco/tracking/lx/Simple/LxDraw.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxDraw.h"
+
 #include "CbmKF.h"
 
 #include "TEllipse.h"
diff --git a/reco/tracking/lx/Simple/LxDraw.h b/reco/tracking/lx/Simple/LxDraw.h
index 1c3f5abf53..5fe7adf2a1 100644
--- a/reco/tracking/lx/Simple/LxDraw.h
+++ b/reco/tracking/lx/Simple/LxDraw.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXDRAW_INCLUDED
 #define LXDRAW_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "TCanvas.h"
diff --git a/reco/tracking/lx/Simple/LxEff.cxx b/reco/tracking/lx/Simple/LxEff.cxx
index 44ebbe34ad..e7f9e4d35e 100644
--- a/reco/tracking/lx/Simple/LxEff.cxx
+++ b/reco/tracking/lx/Simple/LxEff.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 #include "Lx.h"
 #ifdef MAKE_EFF_CALC
 //#include <cmath>
diff --git a/reco/tracking/lx/Simple/LxLinkDef.h b/reco/tracking/lx/Simple/LxLinkDef.h
index 8db023f437..96db0d45d5 100644
--- a/reco/tracking/lx/Simple/LxLinkDef.h
+++ b/reco/tracking/lx/Simple/LxLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/reco/tracking/lx/Simple/LxMC.cxx b/reco/tracking/lx/Simple/LxMC.cxx
index f71a552b7c..08be886d71 100644
--- a/reco/tracking/lx/Simple/LxMC.cxx
+++ b/reco/tracking/lx/Simple/LxMC.cxx
@@ -1,4 +1 @@
-/** @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 **/
 #include "LxMC.h"
diff --git a/reco/tracking/lx/Simple/LxMC.h b/reco/tracking/lx/Simple/LxMC.h
index f4ace2777c..8c9a584fef 100644
--- a/reco/tracking/lx/Simple/LxMC.h
+++ b/reco/tracking/lx/Simple/LxMC.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXMC_INCLUDED
 #define LXMC_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "CbmStsTrack.h"
diff --git a/reco/tracking/lx/Simple/LxParall.cxx b/reco/tracking/lx/Simple/LxParall.cxx
index 79ef846aba..509c2577fb 100644
--- a/reco/tracking/lx/Simple/LxParall.cxx
+++ b/reco/tracking/lx/Simple/LxParall.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxParall.h"
+
 #include <iostream>
 
 #include <omp.h>
diff --git a/reco/tracking/lx/Simple/LxParall.h b/reco/tracking/lx/Simple/LxParall.h
index aa63ed314f..2690a001f7 100644
--- a/reco/tracking/lx/Simple/LxParall.h
+++ b/reco/tracking/lx/Simple/LxParall.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #ifndef LX_PARALL_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 #include "TString.h"
 
diff --git a/reco/tracking/lx/Simple/LxSettings.h b/reco/tracking/lx/Simple/LxSettings.h
index 7c0da7e2fc..b98012f4f8 100644
--- a/reco/tracking/lx/Simple/LxSettings.h
+++ b/reco/tracking/lx/Simple/LxSettings.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXSETTINGS_INCLUDED
 #define LXSETTINGS_INCLUDED
+
 #define LXPI 3.141592653589793238462643383279
 
 #define scaltype float
diff --git a/reco/tracking/lx/Simple/LxTrackAna.cxx b/reco/tracking/lx/Simple/LxTrackAna.cxx
index 7e2ccc45b9..0b3bcbf433 100644
--- a/reco/tracking/lx/Simple/LxTrackAna.cxx
+++ b/reco/tracking/lx/Simple/LxTrackAna.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxTrackAna.h"
+
 #include "CbmKFParticle.h"
 #include "CbmKFTrack.h"
 #include "CbmMCTrack.h"
diff --git a/reco/tracking/lx/Simple/LxTrackAna.h b/reco/tracking/lx/Simple/LxTrackAna.h
index b2b8eaf8a3..bc98f24587 100644
--- a/reco/tracking/lx/Simple/LxTrackAna.h
+++ b/reco/tracking/lx/Simple/LxTrackAna.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXTRACKANA_INCLUDED
 #define LXTRACKANA_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "CbmMuchPixelHit.h"
diff --git a/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx b/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx
index 955d3f81dd..6dc86a0fef 100644
--- a/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx
+++ b/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxTrackAnaSegments.h"
+
 #include "TH1.h"
 #include "TH2.h"
 
diff --git a/reco/tracking/lx/Simple/LxTrackAnaSegments.h b/reco/tracking/lx/Simple/LxTrackAnaSegments.h
index 592de5c76e..91f967e7de 100644
--- a/reco/tracking/lx/Simple/LxTrackAnaSegments.h
+++ b/reco/tracking/lx/Simple/LxTrackAnaSegments.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXTRACKANASEGMENTS_INCLUDED
 #define LXTRACKANASEGMENTS_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "TString.h"
diff --git a/reco/tracking/lx/Simple/LxTrigger.cxx b/reco/tracking/lx/Simple/LxTrigger.cxx
index 72762537cb..e00f0f2c93 100644
--- a/reco/tracking/lx/Simple/LxTrigger.cxx
+++ b/reco/tracking/lx/Simple/LxTrigger.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "TDatabasePDG.h"
+
 #include "Lx.h"
 
 using namespace std;
diff --git a/reco/tracking/lx/Simple/LxUtils.cxx b/reco/tracking/lx/Simple/LxUtils.cxx
index ae39317b1a..47301fcc5e 100644
--- a/reco/tracking/lx/Simple/LxUtils.cxx
+++ b/reco/tracking/lx/Simple/LxUtils.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "Lx.h"
+
 using namespace std;
 
 // Used for building of the background on an invariant mass.
diff --git a/reco/tracking/lx/Simple/LxUtils.h b/reco/tracking/lx/Simple/LxUtils.h
index 791e15f004..5dcbfadb86 100644
--- a/reco/tracking/lx/Simple/LxUtils.h
+++ b/reco/tracking/lx/Simple/LxUtils.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXUTILS_INCLUDED
 #define LXUTILS_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 // Just to make happy the building system -- now it does not contain any definition.
diff --git a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
index f9987bb3cf..c74988a8f8 100644
--- a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/lx/TBBinned/LxTBTask.cxx b/reco/tracking/lx/TBBinned/LxTBTask.cxx
index 923240e81f..faa1da93a5 100644
--- a/reco/tracking/lx/TBBinned/LxTBTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTask.cxx
@@ -1,6 +1,3 @@
-/** @file LxTBTask.cxx
-  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx b/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx
index 21e2152247..625b66ff98 100644
--- a/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
index 7095c820e5..5eff07a6cf 100644
--- a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
@@ -1,6 +1,3 @@
-/** @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 **/
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/reco/tracking/lxTriplet/Lx.cxx b/reco/tracking/lxTriplet/Lx.cxx
index 18d575512b..715827425f 100644
--- a/reco/tracking/lxTriplet/Lx.cxx
+++ b/reco/tracking/lxTriplet/Lx.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "Lx.h"
+
 #include "CbmKFParticle.h"
 #include "CbmKFTrack.h"
 #include "CbmMCTrack.h"
diff --git a/reco/tracking/lxTriplet/Lx.h b/reco/tracking/lxTriplet/Lx.h
index 9461feb758..8c7cf46a76 100644
--- a/reco/tracking/lxTriplet/Lx.h
+++ b/reco/tracking/lxTriplet/Lx.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LX_INCLUDED
 #define LX_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "CbmMuchPixelHit.h"
diff --git a/reco/tracking/lxTriplet/LxCATriplets.cxx b/reco/tracking/lxTriplet/LxCATriplets.cxx
index b108fe57a1..de60c9afb8 100644
--- a/reco/tracking/lxTriplet/LxCATriplets.cxx
+++ b/reco/tracking/lxTriplet/LxCATriplets.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxCATriplets.h"
+
 #include "base/CbmLitToolFactory.h"
 #include "utils/CbmLitConverterFairTrackParam.h"
 
diff --git a/reco/tracking/lxTriplet/LxCATriplets.h b/reco/tracking/lxTriplet/LxCATriplets.h
index ac7fde57c8..7b3933f456 100644
--- a/reco/tracking/lxTriplet/LxCATriplets.h
+++ b/reco/tracking/lxTriplet/LxCATriplets.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXCATRIPLETS_INCLUDED
 #define LXCATRIPLETS_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "Rtypes.h"
diff --git a/reco/tracking/lxTriplet/LxDraw.cxx b/reco/tracking/lxTriplet/LxDraw.cxx
index b6c741fc36..2992cdca9a 100644
--- a/reco/tracking/lxTriplet/LxDraw.cxx
+++ b/reco/tracking/lxTriplet/LxDraw.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #ifdef LXDRAW
+
 #include "LxDraw.h"
 
 #include "CbmKF.h"
diff --git a/reco/tracking/lxTriplet/LxDraw.h b/reco/tracking/lxTriplet/LxDraw.h
index c8fbb38615..ed19ce12d5 100644
--- a/reco/tracking/lxTriplet/LxDraw.h
+++ b/reco/tracking/lxTriplet/LxDraw.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXDRAW_INCLUDED
 #define LXDRAW_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #ifdef LXDRAW
diff --git a/reco/tracking/lxTriplet/LxEff.cxx b/reco/tracking/lxTriplet/LxEff.cxx
index d411a36b5a..f1536de4ed 100644
--- a/reco/tracking/lxTriplet/LxEff.cxx
+++ b/reco/tracking/lxTriplet/LxEff.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxEff.h"
+
 #include <set>
 
 #include <cmath>
diff --git a/reco/tracking/lxTriplet/LxEff.h b/reco/tracking/lxTriplet/LxEff.h
index d33de70ea2..37288414bb 100644
--- a/reco/tracking/lxTriplet/LxEff.h
+++ b/reco/tracking/lxTriplet/LxEff.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXEFF_INCLUDED
 #define LXEFF_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "Rtypes.h"
diff --git a/reco/tracking/lxTriplet/LxLinkDef.h b/reco/tracking/lxTriplet/LxLinkDef.h
index d6ccf9a2c4..f199b4fbaf 100644
--- a/reco/tracking/lxTriplet/LxLinkDef.h
+++ b/reco/tracking/lxTriplet/LxLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/reco/tracking/lxTriplet/LxMC.cxx b/reco/tracking/lxTriplet/LxMC.cxx
index 3b468bf4d1..08be886d71 100644
--- a/reco/tracking/lxTriplet/LxMC.cxx
+++ b/reco/tracking/lxTriplet/LxMC.cxx
@@ -1,4 +1 @@
-/** @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 **/
 #include "LxMC.h"
diff --git a/reco/tracking/lxTriplet/LxMC.h b/reco/tracking/lxTriplet/LxMC.h
index f150843806..a06ccec438 100644
--- a/reco/tracking/lxTriplet/LxMC.h
+++ b/reco/tracking/lxTriplet/LxMC.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXMC_INCLUDED
 #define LXMC_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "CbmStsTrack.h"
diff --git a/reco/tracking/lxTriplet/LxSettings.h b/reco/tracking/lxTriplet/LxSettings.h
index 7121c7f9af..e77ae86382 100644
--- a/reco/tracking/lxTriplet/LxSettings.h
+++ b/reco/tracking/lxTriplet/LxSettings.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXSETTINGS_INCLUDED
 #define LXSETTINGS_INCLUDED
+
 #define LXPI 3.141592653589793238462643383279
 
 #define LXLAYERS 3
diff --git a/reco/tracking/lxTriplet/LxTrackAna.cxx b/reco/tracking/lxTriplet/LxTrackAna.cxx
index 1a59ca3aa7..d6f1a6981b 100644
--- a/reco/tracking/lxTriplet/LxTrackAna.cxx
+++ b/reco/tracking/lxTriplet/LxTrackAna.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxTrackAna.h"
+
 #include "CbmKFParticle.h"
 #include "CbmKFTrack.h"
 #include "CbmMCTrack.h"
diff --git a/reco/tracking/lxTriplet/LxTrackAna.h b/reco/tracking/lxTriplet/LxTrackAna.h
index e7f3b658a3..d5df48a22d 100644
--- a/reco/tracking/lxTriplet/LxTrackAna.h
+++ b/reco/tracking/lxTriplet/LxTrackAna.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXTRACKANA_INCLUDED
 #define LXTRACKANA_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "CbmMuchPixelHit.h"
diff --git a/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx b/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx
index 3caeef9e37..95ba2eca08 100644
--- a/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx
+++ b/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "LxTrackAnaSegments.h"
+
 #include "TH1.h"
 #include "TH2.h"
 
diff --git a/reco/tracking/lxTriplet/LxTrackAnaSegments.h b/reco/tracking/lxTriplet/LxTrackAnaSegments.h
index ead4bf8828..fe3c2e9ea1 100644
--- a/reco/tracking/lxTriplet/LxTrackAnaSegments.h
+++ b/reco/tracking/lxTriplet/LxTrackAnaSegments.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXTRACKANASEGMENTS_INCLUDED
 #define LXTRACKANASEGMENTS_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 #include "TString.h"
diff --git a/reco/tracking/lxTriplet/LxUtils.cxx b/reco/tracking/lxTriplet/LxUtils.cxx
index fd7326dc9b..4d2e2b0dc4 100644
--- a/reco/tracking/lxTriplet/LxUtils.cxx
+++ b/reco/tracking/lxTriplet/LxUtils.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "Lx.h"
+
 using namespace std;
 
 // Used for building of the background on an invariant mass.
diff --git a/reco/tracking/lxTriplet/LxUtils.h b/reco/tracking/lxTriplet/LxUtils.h
index 34b77704e1..5dcbfadb86 100644
--- a/reco/tracking/lxTriplet/LxUtils.h
+++ b/reco/tracking/lxTriplet/LxUtils.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef LXUTILS_INCLUDED
 #define LXUTILS_INCLUDED
+
 #pragma GCC diagnostic ignored "-Weffc++"
 
 // Just to make happy the building system -- now it does not contain any definition.
diff --git a/reco/tracking/vector/CbmVectorLinkDef.h b/reco/tracking/vector/CbmVectorLinkDef.h
index 8e86d1ce50..0c733bad8e 100644
--- a/reco/tracking/vector/CbmVectorLinkDef.h
+++ b/reco/tracking/vector/CbmVectorLinkDef.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/scripts/loadlib.C b/scripts/loadlib.C
index 5163cf1c18..682767d841 100644
--- a/scripts/loadlib.C
+++ b/scripts/loadlib.C
@@ -1,6 +1,3 @@
-/** @file loadlib.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 Int_t loadlib(TString libname)
 {
   Int_t retval = gSystem->Load(libname);
diff --git a/sim/detectors/much/CbmMuch.cxx b/sim/detectors/much/CbmMuch.cxx
index 14e5730676..b9c05bc640 100644
--- a/sim/detectors/much/CbmMuch.cxx
+++ b/sim/detectors/much/CbmMuch.cxx
@@ -1,6 +1,3 @@
-/** @file CbmMuch.cxx
-  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 //----------------------------------------------------------------------------------------
 //--------------                                  CbmMuch                      -----------
 //---------------                   Modified 18/10/2017 by Omveer Singh        -----------
diff --git a/sim/detectors/much/CbmMuchSimLinkDef.h b/sim/detectors/much/CbmMuchSimLinkDef.h
index 026005c817..d1e42294c1 100644
--- a/sim/detectors/much/CbmMuchSimLinkDef.h
+++ b/sim/detectors/much/CbmMuchSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmMuchSimLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/detectors/psd/CbmPsdSimLinkDef.h b/sim/detectors/psd/CbmPsdSimLinkDef.h
index fa5ea46f63..95cd85ac1a 100644
--- a/sim/detectors/psd/CbmPsdSimLinkDef.h
+++ b/sim/detectors/psd/CbmPsdSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmPsdSimLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/detectors/rich/CbmRich.cxx b/sim/detectors/rich/CbmRich.cxx
index 2f6162af6f..2a33e69bed 100644
--- a/sim/detectors/rich/CbmRich.cxx
+++ b/sim/detectors/rich/CbmRich.cxx
@@ -1,7 +1,5 @@
-/** @file CbmRich.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmRich.h"
+
 #include "CbmGeometryUtils.h"
 #include "CbmRichPoint.h"
 #include "CbmStack.h"
diff --git a/sim/detectors/rich/CbmRichSimLinkDef.h b/sim/detectors/rich/CbmRichSimLinkDef.h
index e9ded2239d..2c449eef1a 100644
--- a/sim/detectors/rich/CbmRichSimLinkDef.h
+++ b/sim/detectors/rich/CbmRichSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmRichSimLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.cxx b/sim/detectors/sts/CbmStsDigitizeQa.cxx
index bc15d3a12d..11078d59e8 100644
--- a/sim/detectors/sts/CbmStsDigitizeQa.cxx
+++ b/sim/detectors/sts/CbmStsDigitizeQa.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmStsDigitizeQa.h"
+
 #include "CbmDigiManager.h"
 #include "CbmHistManager.h"
 #include "CbmMCDataManager.h"
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.h b/sim/detectors/sts/CbmStsDigitizeQa.h
index 16f886c586..08e2cf7499 100644
--- a/sim/detectors/sts/CbmStsDigitizeQa.h
+++ b/sim/detectors/sts/CbmStsDigitizeQa.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CBMSTSDIGITIZEQA_H_
 #define CBMSTSDIGITIZEQA_H_
+
 #include "CbmHistManager.h"
 #include "CbmMCDataArray.h"
 #include "CbmStsDigi.h"
diff --git a/sim/detectors/sts/CbmStsDigitizeQaReport.cxx b/sim/detectors/sts/CbmStsDigitizeQaReport.cxx
index 466506f881..be937cff4a 100644
--- a/sim/detectors/sts/CbmStsDigitizeQaReport.cxx
+++ b/sim/detectors/sts/CbmStsDigitizeQaReport.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmStsDigitizeQaReport.h"
+
 #include "CbmDrawHist.h"
 #include "CbmHistManager.h"
 #include "CbmReportElement.h"
diff --git a/sim/detectors/sts/CbmStsDigitizeQaReport.h b/sim/detectors/sts/CbmStsDigitizeQaReport.h
index 4c6a2ca736..82cd5ce1b4 100644
--- a/sim/detectors/sts/CbmStsDigitizeQaReport.h
+++ b/sim/detectors/sts/CbmStsDigitizeQaReport.h
@@ -1,8 +1,6 @@
-/** @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 **/
 #ifndef CBMSTSDIGITIZEQAREPORT_H_
 #define CBMSTSDIGITIZEQAREPORT_H_
+
 #include "CbmSimulationReport.h"
 
 class CbmStsParAsic;
diff --git a/sim/detectors/sts/CbmStsSimLinkDef.h b/sim/detectors/sts/CbmStsSimLinkDef.h
index e30d2b3c80..478a5bce4b 100644
--- a/sim/detectors/sts/CbmStsSimLinkDef.h
+++ b/sim/detectors/sts/CbmStsSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmStsSimLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/detectors/tof/CbmTofSimLinkDef.h b/sim/detectors/tof/CbmTofSimLinkDef.h
index 1095b88d8f..49431256bb 100644
--- a/sim/detectors/tof/CbmTofSimLinkDef.h
+++ b/sim/detectors/tof/CbmTofSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTofSimLinkDef.h
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/detectors/trd/CbmTrdCheckUtil.cxx b/sim/detectors/trd/CbmTrdCheckUtil.cxx
index 74b796fd77..dd50450738 100644
--- a/sim/detectors/trd/CbmTrdCheckUtil.cxx
+++ b/sim/detectors/trd/CbmTrdCheckUtil.cxx
@@ -1,8 +1,6 @@
-/** @file CbmTrdCheckUtil.cxx
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Includes from TRD
 #include "CbmTrdCheckUtil.h"
+
 #include "CbmTrdDigi.h"
 
 #include "TMath.h"
diff --git a/sim/detectors/trd/CbmTrdCheckUtil.h b/sim/detectors/trd/CbmTrdCheckUtil.h
index ea6ac95ead..bd8a2de8e4 100644
--- a/sim/detectors/trd/CbmTrdCheckUtil.h
+++ b/sim/detectors/trd/CbmTrdCheckUtil.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdCheckUtil.h
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDCHECKUTIL_H
 #define CBMTRDCHECKUTIL_H
+
 #include "CbmTrdDigi.h"
 
 #include <FairRootManager.h>
diff --git a/sim/detectors/trd/CbmTrdDigitizer.cxx b/sim/detectors/trd/CbmTrdDigitizer.cxx
index b27f75ce1e..c98fecd12d 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.cxx
+++ b/sim/detectors/trd/CbmTrdDigitizer.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdDigitizer.cxx
-  * @copyright Copyright (C) 2009-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdDigitizer.h"
+
 #include "CbmMCTrack.h"
 #include "CbmMatch.h"
 #include "CbmTrdAddress.h"
diff --git a/sim/detectors/trd/CbmTrdModuleSim.cxx b/sim/detectors/trd/CbmTrdModuleSim.cxx
index 6ac431ba67..0d8ae3f2f2 100644
--- a/sim/detectors/trd/CbmTrdModuleSim.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSim.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdModuleSim.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdModuleSim.h"
+
 #include "CbmTrdParModDigi.h"
 #include "CbmTrdParModGain.h"
 #include "CbmTrdParModGas.h"
diff --git a/sim/detectors/trd/CbmTrdModuleSim.h b/sim/detectors/trd/CbmTrdModuleSim.h
index 545a6988cb..cc5a7ccfd4 100644
--- a/sim/detectors/trd/CbmTrdModuleSim.h
+++ b/sim/detectors/trd/CbmTrdModuleSim.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleSim.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMODULESIM_H
 #define CBMTRDMODULESIM_H
+
 #include "CbmTrdCheckUtil.h"
 #include "CbmTrdModuleAbstract.h"
 #include "CbmTrdRawToDigiR.h"
diff --git a/sim/detectors/trd/CbmTrdModuleSimR.cxx b/sim/detectors/trd/CbmTrdModuleSimR.cxx
index 96c40a60ac..fdbdd93dfc 100644
--- a/sim/detectors/trd/CbmTrdModuleSimR.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimR.cxx
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleSimR.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Includes from TRD
 #include "CbmTrdModuleSimR.h"
+
 #include "CbmTrdAddress.h"
 #include "CbmTrdDigi.h"
 #include "CbmTrdDigitizer.h"
diff --git a/sim/detectors/trd/CbmTrdModuleSimR.h b/sim/detectors/trd/CbmTrdModuleSimR.h
index 627ff2b132..4edff36739 100644
--- a/sim/detectors/trd/CbmTrdModuleSimR.h
+++ b/sim/detectors/trd/CbmTrdModuleSimR.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdModuleSimR.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMODULESIMR_H
 #define CBMTRDMODULESIMR_H
+
 #include "CbmTrdCheckUtil.h"
 #include "CbmTrdModuleSim.h"
 #include "CbmTrdRawToDigiR.h"
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.cxx b/sim/detectors/trd/CbmTrdModuleSimT.cxx
index 601205774c..4895e1829c 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimT.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdModuleSimT.cxx
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdModuleSimT.h"
+
 #include "CbmDigitizeBase.h"
 #include "CbmMatch.h"
 #include "CbmTimeSlice.h"
diff --git a/sim/detectors/trd/CbmTrdRawToDigiR.cxx b/sim/detectors/trd/CbmTrdRawToDigiR.cxx
index e89992abbf..b22bbe2342 100644
--- a/sim/detectors/trd/CbmTrdRawToDigiR.cxx
+++ b/sim/detectors/trd/CbmTrdRawToDigiR.cxx
@@ -1,8 +1,6 @@
-/** @file CbmTrdRawToDigiR.cxx
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Includes from TRD
 #include "CbmTrdRawToDigiR.h"
+
 #include "CbmTrdAddress.h"
 #include "CbmTrdDigi.h"
 
diff --git a/sim/detectors/trd/CbmTrdRawToDigiR.h b/sim/detectors/trd/CbmTrdRawToDigiR.h
index 5a35012282..69cf3f003b 100644
--- a/sim/detectors/trd/CbmTrdRawToDigiR.h
+++ b/sim/detectors/trd/CbmTrdRawToDigiR.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdRawToDigiR.h
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDRAWTODIGI_H
 #define CBMTRDRAWTODIGI_H
+
 #include "CbmTrdCheckUtil.h"
 #include "CbmTrdDigi.h"
 //#include "CbmSpadicRawMessage22.h"
diff --git a/sim/detectors/trd/CbmTrdSimLinkDef.h b/sim/detectors/trd/CbmTrdSimLinkDef.h
index 1e527aedf0..391b8df2f7 100644
--- a/sim/detectors/trd/CbmTrdSimLinkDef.h
+++ b/sim/detectors/trd/CbmTrdSimLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTrdSimLinkDef.h
-  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: TrdSimLinkDef.h $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/sim/detectors/trd/CbmTrdTrianglePRF.h b/sim/detectors/trd/CbmTrdTrianglePRF.h
index 5058781d6c..cc8cce266e 100644
--- a/sim/detectors/trd/CbmTrdTrianglePRF.h
+++ b/sim/detectors/trd/CbmTrdTrianglePRF.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdTrianglePRF.h
-  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDTRIANGLEPRF_H
 #define CBMTRDTRIANGLEPRF_H 1
+
 #include <TObject.h>
 
 #include <iostream>
diff --git a/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h b/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h
index 80c4489c00..15ef8f6f2b 100644
--- a/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h
+++ b/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdDigitizerPRFQa.h
-  * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDDIGITIZERPRFQA_H
 #define CBMTRDDIGITIZERPRFQA_H 1
+
 #include "FairTask.h"
 
 class TClonesArray;
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
index b3360da840..cee864423a 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdHitRateFastQa.cxx
-  * @copyright Copyright (C) 2013-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdHitRateFastQa.h"
+
 #include "CbmTrdAddress.h"
 #include "CbmTrdGeoHandler.h"
 #include "CbmTrdParAsic.h"
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
index 4a6bb2b9ad..c9ba195303 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdHitRateFastQa.h
-  * @copyright Copyright (C) 2013-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDHITRATEFASTQA_H_
 #define CBMTRDHITRATEFASTQA_H_
+
 #include "CbmTrdDigi.h"
 
 #include "FairTask.h"
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx
index 4477336558..68732a3319 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdHitRateQa.cxx
-  * @copyright Copyright (C) 2010-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdHitRateQa.h"
+
 #include "CbmTrdAddress.h"
 #include "CbmTrdGeoHandler.h"
 #include "CbmTrdParModDigi.h"
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateQa.h b/sim/detectors/trd/qa/CbmTrdHitRateQa.h
index fdbd1574ca..ed83d2cf37 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateQa.h
+++ b/sim/detectors/trd/qa/CbmTrdHitRateQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdHitRateQa.h
-  * @copyright Copyright (C) 2010-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDHITRATEQA_H_
 #define CBMTRDHITRATEQA_H_
+
 #include "CbmTrdDigi.h"
 
 #include "FairTask.h"
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.cxx b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
index 704b5fb037..a3cb59a9c0 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
@@ -1,7 +1,5 @@
-/** @file CbmTrdMCQa.cxx
-  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmTrdMCQa.h"
+
 #include "CbmHistManager.h"
 #include "CbmSimulationReport.h"
 #include "CbmTrdAddress.h"
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.h b/sim/detectors/trd/qa/CbmTrdMCQa.h
index 89103cbd11..608d6c48fe 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.h
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.h
@@ -1,8 +1,6 @@
-/** @file CbmTrdMCQa.h
-  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMTRDMCQA_H_
 #define CBMTRDMCQA_H_
+
 #include "FairTask.h"
 
 #include "Rtypes.h"
diff --git a/sim/passive/CbmCave.cxx b/sim/passive/CbmCave.cxx
index 287797a6e5..dbcd146fc7 100644
--- a/sim/passive/CbmCave.cxx
+++ b/sim/passive/CbmCave.cxx
@@ -1,7 +1,5 @@
-/** @file CbmCave.cxx
-  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /* Generated by Together */
+
 #include "CbmCave.h"
 
 #include "CbmGeoCave.h"
diff --git a/sim/passive/CbmCave.h b/sim/passive/CbmCave.h
index e299eeaf6d..17d764f9ae 100644
--- a/sim/passive/CbmCave.h
+++ b/sim/passive/CbmCave.h
@@ -1,8 +1,6 @@
-/** @file CbmCave.h
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef Cave_H
 #define Cave_H
+
 #include "FairModule.h"
 
 
diff --git a/sim/passive/CbmGeoCave.h b/sim/passive/CbmGeoCave.h
index 44074d69fc..f53bae8040 100644
--- a/sim/passive/CbmGeoCave.h
+++ b/sim/passive/CbmGeoCave.h
@@ -1,8 +1,6 @@
-/** @file CbmGeoCave.h
-  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMGEOCAVE_H
 #define CBMGEOCAVE_H
+
 #include "FairGeoSet.h"
 
 #include "TString.h"
diff --git a/sim/passive/CbmGeoPassivePar.h b/sim/passive/CbmGeoPassivePar.h
index 93e231264f..e0c50d837d 100644
--- a/sim/passive/CbmGeoPassivePar.h
+++ b/sim/passive/CbmGeoPassivePar.h
@@ -1,8 +1,6 @@
-/** @file CbmGeoPassivePar.h
-  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMGEOPASSIVEPAR_H
 #define CBMGEOPASSIVEPAR_H
+
 #include "FairParGenericSet.h"
 
 class CbmGeoPassivePar : public FairParGenericSet {
diff --git a/sim/passive/CbmGeoPlatform.cxx b/sim/passive/CbmGeoPlatform.cxx
index de7185ce86..bcdf65cc7f 100644
--- a/sim/passive/CbmGeoPlatform.cxx
+++ b/sim/passive/CbmGeoPlatform.cxx
@@ -1,6 +1,3 @@
-/** @file CbmGeoPlatform.cxx
-  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /////////////////////////////////////////////////////////////
 // CbmGeoPlatform
 //
diff --git a/sim/passive/CbmGeoPlatform.h b/sim/passive/CbmGeoPlatform.h
index 6564e80540..c78911f6d0 100644
--- a/sim/passive/CbmGeoPlatform.h
+++ b/sim/passive/CbmGeoPlatform.h
@@ -1,8 +1,6 @@
-/** @file CbmGeoPlatform.h
-  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMGEOPLATFORM_H
 #define CBMGEOPLATFORM_H
+
 #include "FairGeoSet.h"
 
 class CbmGeoPlatform : public FairGeoSet {
diff --git a/sim/passive/CbmMagnet.cxx b/sim/passive/CbmMagnet.cxx
index b03f2a8041..8989b1e791 100644
--- a/sim/passive/CbmMagnet.cxx
+++ b/sim/passive/CbmMagnet.cxx
@@ -1,7 +1,5 @@
-/** @file CbmMagnet.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /* Generated by Together */
+
 #include "CbmMagnet.h"
 
 #include <TString.h>
diff --git a/sim/passive/CbmMagnet.h b/sim/passive/CbmMagnet.h
index 7c2904f837..9fd3bc244b 100644
--- a/sim/passive/CbmMagnet.h
+++ b/sim/passive/CbmMagnet.h
@@ -1,8 +1,6 @@
-/** @file CbmMagnet.h
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMMAGNET_H
 #define CBMMAGNET_H
+
 #include "FairModule.h"
 
 class TGeoRotation;
diff --git a/sim/passive/CbmPassiveContFact.h b/sim/passive/CbmPassiveContFact.h
index a091e39c13..5ad116e36e 100644
--- a/sim/passive/CbmPassiveContFact.h
+++ b/sim/passive/CbmPassiveContFact.h
@@ -1,8 +1,6 @@
-/** @file CbmPassiveContFact.h
-  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMPASSIVECONTFACT_H
 #define CBMPASSIVECONTFACT_H
+
 #include "FairContFact.h"
 
 class FairContainer;
diff --git a/sim/passive/CbmPassiveLinkDef.h b/sim/passive/CbmPassiveLinkDef.h
index 43ef451492..ed23d27231 100644
--- a/sim/passive/CbmPassiveLinkDef.h
+++ b/sim/passive/CbmPassiveLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmPassiveLinkDef.h
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // $Id: PassiveLinkDef.h,v 1.1.1.1 2005/06/23 07:14:26 dbertini Exp $
+
 #ifdef __CINT__
 
 #pragma link off all globals;
diff --git a/sim/passive/CbmPipe.cxx b/sim/passive/CbmPipe.cxx
index fb5f058a14..2961b39dfd 100644
--- a/sim/passive/CbmPipe.cxx
+++ b/sim/passive/CbmPipe.cxx
@@ -1,8 +1,6 @@
-/** @file CbmPipe.cxx
-  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /* Generated by Together */
 #include "CbmPipe.h"
+
 #include "CbmGeometryUtils.h"
 
 #include "TFile.h"
diff --git a/sim/passive/CbmPipe.h b/sim/passive/CbmPipe.h
index 84c1ce7208..fd3c817eaf 100644
--- a/sim/passive/CbmPipe.h
+++ b/sim/passive/CbmPipe.h
@@ -1,8 +1,6 @@
-/** @file CbmPipe.h
-  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef CBMPIPE_H
 #define CBMPIPE_H 1
+
 #include "FairModule.h"
 
 #include <string>
diff --git a/sim/passive/CbmPlatform.cxx b/sim/passive/CbmPlatform.cxx
index a0f142618c..e9212e739f 100644
--- a/sim/passive/CbmPlatform.cxx
+++ b/sim/passive/CbmPlatform.cxx
@@ -1,8 +1,6 @@
-/** @file CbmPlatform.cxx
-  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 /* Generated by Together */
 #include "CbmPlatform.h"
+
 #include "CbmGeoPassivePar.h"
 #include "CbmGeoPlatform.h"
 #include "CbmGeometryUtils.h"
diff --git a/sim/passive/CbmPlatform.h b/sim/passive/CbmPlatform.h
index d47a1a0e59..c058ab5aeb 100644
--- a/sim/passive/CbmPlatform.h
+++ b/sim/passive/CbmPlatform.h
@@ -1,8 +1,6 @@
-/** @file CbmPlatform.h
-  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef PLATFORM_H
 #define PLATFORM_H
+
 #include "FairModule.h"
 
 #include <string>
diff --git a/sim/response/CbmSimResponseLinkDef.h b/sim/response/CbmSimResponseLinkDef.h
index 3faa023a76..d62fa29ff6 100644
--- a/sim/response/CbmSimResponseLinkDef.h
+++ b/sim/response/CbmSimResponseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmSimResponseLinkDef.h
-  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/response/base/CbmDigitizationConfig.cxx b/sim/response/base/CbmDigitizationConfig.cxx
index 0dcd88264c..37e5a2db1e 100644
--- a/sim/response/base/CbmDigitizationConfig.cxx
+++ b/sim/response/base/CbmDigitizationConfig.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmDigitizationConfig.h"
+
 #include "CbmDigitization.h"
 
 using namespace std;
diff --git a/sim/response/base/CbmDigitizationConfig.h b/sim/response/base/CbmDigitizationConfig.h
index 8fb2951370..6d96f6ea1d 100644
--- a/sim/response/base/CbmDigitizationConfig.h
+++ b/sim/response/base/CbmDigitizationConfig.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #pragma once
+
 #include "CbmConfigBase.h"
 
 class CbmDigitization;
diff --git a/sim/transport/base/CbmSimBaseLinkDef.h b/sim/transport/base/CbmSimBaseLinkDef.h
index e793de07f5..680d232b2a 100644
--- a/sim/transport/base/CbmSimBaseLinkDef.h
+++ b/sim/transport/base/CbmSimBaseLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmSimBaseLinkDef.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/transport/gconfig/SetCuts.C b/sim/transport/gconfig/SetCuts.C
index 2cb5685078..4f6800a0a4 100644
--- a/sim/transport/gconfig/SetCuts.C
+++ b/sim/transport/gconfig/SetCuts.C
@@ -1,6 +1,4 @@
-/** @file SetCuts.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
+
 /** 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/g4Config.C b/sim/transport/gconfig/g4Config.C
index d6c62ac0cb..7826d2004e 100644
--- a/sim/transport/gconfig/g4Config.C
+++ b/sim/transport/gconfig/g4Config.C
@@ -1,6 +1,3 @@
-/** @file g4Config.C
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // Configuration macro for Geant4 VirtualMC
 void Config()
 {
diff --git a/sim/transport/generators/CbmSimGeneratorsLinkDef.h b/sim/transport/generators/CbmSimGeneratorsLinkDef.h
index 94cebb9528..953051b44e 100644
--- a/sim/transport/generators/CbmSimGeneratorsLinkDef.h
+++ b/sim/transport/generators/CbmSimGeneratorsLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmSimGeneratorsLinkDef.h
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/transport/generators/pluto/PValues.cxx b/sim/transport/generators/pluto/PValues.cxx
index 447b1d8238..6ba257740a 100644
--- a/sim/transport/generators/pluto/PValues.cxx
+++ b/sim/transport/generators/pluto/PValues.cxx
@@ -1,6 +1,3 @@
-/** @file PValues.cxx
-  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 ////////////////////////////////////////////////////////
 //  Value container implementation file
 //
diff --git a/sim/transport/generators/pluto/Pdefines.h b/sim/transport/generators/pluto/Pdefines.h
index cc8d0a9d01..1f52915214 100644
--- a/sim/transport/generators/pluto/Pdefines.h
+++ b/sim/transport/generators/pluto/Pdefines.h
@@ -1,6 +1,3 @@
-/** @file Pdefines.h
-  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #define PRINT_CTOR "CONSTRUCTOR"
 #define PRINT_AUTO_ALLOC "ALLOCATION"
 #define PRINT_WARNING "### WARNING:"
diff --git a/sim/transport/generators/unigen/UEvent.cxx b/sim/transport/generators/unigen/UEvent.cxx
index e6b3a6d110..1f755130ed 100644
--- a/sim/transport/generators/unigen/UEvent.cxx
+++ b/sim/transport/generators/unigen/UEvent.cxx
@@ -1,7 +1,5 @@
-/** @file UEvent.cxx
-  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "UEvent.h"
+
 #include "TClonesArray.h"
 #include "TString.h"
 
diff --git a/sim/transport/generators/unigen/UEvent.h b/sim/transport/generators/unigen/UEvent.h
index 971eba3256..d3f4bfa5cc 100644
--- a/sim/transport/generators/unigen/UEvent.h
+++ b/sim/transport/generators/unigen/UEvent.h
@@ -1,8 +1,6 @@
-/** @file UEvent.h
-  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef UEVENT_H
 #define UEVENT_H
+
 #include "TLorentzVector.h"
 #include "TObject.h"
 
diff --git a/sim/transport/generators/unigen/UParticle.cxx b/sim/transport/generators/unigen/UParticle.cxx
index 082c796e02..e86c5bc287 100644
--- a/sim/transport/generators/unigen/UParticle.cxx
+++ b/sim/transport/generators/unigen/UParticle.cxx
@@ -1,7 +1,5 @@
-/** @file UParticle.cxx
-  * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "UParticle.h"
+
 #include "TParticle.h"
 
 #include <iostream>
diff --git a/sim/transport/generators/unigen/UParticle.h b/sim/transport/generators/unigen/UParticle.h
index 070fd9cfbf..8cec936233 100644
--- a/sim/transport/generators/unigen/UParticle.h
+++ b/sim/transport/generators/unigen/UParticle.h
@@ -1,8 +1,6 @@
-/** @file UParticle.h
-  * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef UPARTICLE_H
 #define UPARTICLE_H
+
 #include "TLorentzVector.h"
 #include "TObject.h"
 
diff --git a/sim/transport/generators/unigen/URun.cxx b/sim/transport/generators/unigen/URun.cxx
index 8dbf454020..1a516e5ebd 100644
--- a/sim/transport/generators/unigen/URun.cxx
+++ b/sim/transport/generators/unigen/URun.cxx
@@ -1,8 +1,6 @@
-/** @file URun.cxx
-  * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include <iostream>
 using namespace std;
+
 #include <Logger.h>
 
 #include "TMath.h"
diff --git a/sim/transport/generators/unigen/URun.h b/sim/transport/generators/unigen/URun.h
index 92b7e70f35..7a94c355ab 100644
--- a/sim/transport/generators/unigen/URun.h
+++ b/sim/transport/generators/unigen/URun.h
@@ -1,8 +1,6 @@
-/** @file URun.h
-  * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifndef URUN_H
 #define URUN_H
+
 #include "TNamed.h"
 #include "TString.h"
 
diff --git a/sim/transport/geosetup/CbmGeoSetupLinkDef.h b/sim/transport/geosetup/CbmGeoSetupLinkDef.h
index ce76c8ebfa..3f292d305b 100644
--- a/sim/transport/geosetup/CbmGeoSetupLinkDef.h
+++ b/sim/transport/geosetup/CbmGeoSetupLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmGeoSetupLinkDef.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/transport/steer/CbmGeant3Settings.cxx b/sim/transport/steer/CbmGeant3Settings.cxx
index 9687244e6a..6cbd66a033 100644
--- a/sim/transport/steer/CbmGeant3Settings.cxx
+++ b/sim/transport/steer/CbmGeant3Settings.cxx
@@ -1,7 +1,5 @@
-/** @file CbmGeant3Settings.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmGeant3Settings.h"
+
 #include <Logger.h>
 
 #include <TGeant3.h>
diff --git a/sim/transport/steer/CbmGeant4Settings.cxx b/sim/transport/steer/CbmGeant4Settings.cxx
index d5e576886f..16c12570c2 100644
--- a/sim/transport/steer/CbmGeant4Settings.cxx
+++ b/sim/transport/steer/CbmGeant4Settings.cxx
@@ -1,7 +1,5 @@
-/** @file CbmGeant4Settings.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmGeant4Settings.h"
+
 #include <FairRunSim.h>
 #include <Logger.h>
 
diff --git a/sim/transport/steer/CbmSimSteerLinkDef.h b/sim/transport/steer/CbmSimSteerLinkDef.h
index 5e0519ddea..ac2669aed4 100644
--- a/sim/transport/steer/CbmSimSteerLinkDef.h
+++ b/sim/transport/steer/CbmSimSteerLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmSimSteerLinkDef.h
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/sim/transport/steer/CbmTransportConfig.cxx b/sim/transport/steer/CbmTransportConfig.cxx
index 123f2f39e0..d7471ac7e1 100644
--- a/sim/transport/steer/CbmTransportConfig.cxx
+++ b/sim/transport/steer/CbmTransportConfig.cxx
@@ -1,7 +1,5 @@
-/** @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 **/
 #include "CbmTransportConfig.h"
+
 #include "CbmBeamGenerator.h"
 #include "CbmGeant4Settings.h"
 #include "CbmPlutoGenerator.h"
diff --git a/sim/transport/steer/CbmTransportConfig.h b/sim/transport/steer/CbmTransportConfig.h
index 38208f8604..ba7cea807b 100644
--- a/sim/transport/steer/CbmTransportConfig.h
+++ b/sim/transport/steer/CbmTransportConfig.h
@@ -1,7 +1,5 @@
-/** @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 **/
 #pragma once
+
 #include "CbmConfigBase.h"
 
 class CbmTransport;
diff --git a/sim/transport/steer/CbmVMCSettings.cxx b/sim/transport/steer/CbmVMCSettings.cxx
index 4fadd1ccc1..07cfa858d6 100644
--- a/sim/transport/steer/CbmVMCSettings.cxx
+++ b/sim/transport/steer/CbmVMCSettings.cxx
@@ -1,7 +1,5 @@
-/** @file CbmVMCSettings.cxx
-  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmVMCSettings.h"
+
 #include <Logger.h>
 
 #include <TVirtualMC.h>
diff --git a/tutorials/TaskToAlgo/CbmAlgo.h b/tutorials/TaskToAlgo/CbmAlgo.h
index 884046f0cf..cb00cd3301 100644
--- a/tutorials/TaskToAlgo/CbmAlgo.h
+++ b/tutorials/TaskToAlgo/CbmAlgo.h
@@ -1,6 +1,3 @@
-/** @file CbmAlgo.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                         CbmAlgo                                   -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
index 6721aa4a7a..45724cc50e 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
@@ -1,6 +1,3 @@
-/** @file CbmStsHitProducerIdealAlgo.cxx
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmStsHitProducerIdealAlgo                    -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h
index 1eaf078b96..5c5832ece3 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h
@@ -1,6 +1,3 @@
-/** @file CbmStsHitProducerIdealAlgo.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmStsHitProducerIdealAlgo                    -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h
index 775a00e5f6..2aadc31dcd 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h
@@ -1,6 +1,3 @@
-/** @file CbmStsHitProducerIdealWrapper.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -------------------------------------------------------------------------
 // -----            CbmStsHitProducerIdealWrapper header file          -----
 // -------------------------------------------------------------------------
diff --git a/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h b/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h
index ba29ba7ad9..0efca3c917 100644
--- a/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h
+++ b/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h
@@ -1,7 +1,5 @@
-/** @file CbmTaskToAlgoTutorialLinkDef.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #ifdef __CINT__
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx b/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
index af5b4c14ec..618b45c66b 100644
--- a/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
+++ b/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
@@ -1,6 +1,3 @@
-/** @file CbmTemplateAlgo.cxx
-  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmTemplateAlgo                    -----
diff --git a/tutorials/TaskToAlgo/CbmTemplateAlgo.h b/tutorials/TaskToAlgo/CbmTemplateAlgo.h
index 1e7f6687d7..92d6fb9a06 100644
--- a/tutorials/TaskToAlgo/CbmTemplateAlgo.h
+++ b/tutorials/TaskToAlgo/CbmTemplateAlgo.h
@@ -1,6 +1,3 @@
-/** @file CbmTemplateAlgo.h
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                            CbmTemplateAlgo                        -----
diff --git a/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx b/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx
index 029fd036ac..452a3ff240 100644
--- a/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx
+++ b/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx
@@ -1,7 +1,5 @@
-/** @file runStsHitProducerIdeal.cxx
-  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
-  * @license SPDX-License-Identifier: GPL-3.0-only **/
 #include "CbmDeviceStsHitProducerIdeal.h"
+
 #include <iostream>
 
 #include "runFairMQDevice.h"
-- 
GitLab