diff --git a/core/base/CbmHistManager.cxx b/core/base/CbmHistManager.cxx
index df74b7041ddbc99ecb453a470c538755f97b3be5..3e0e575b75c41b415d63d5b5773bcdf084f32d5c 100644
--- a/core/base/CbmHistManager.cxx
+++ b/core/base/CbmHistManager.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/CbmHistManager.h b/core/base/CbmHistManager.h
index 9d14ac14b4abdd26e62a6579d6fd1f1bec494749..1cc64d1a7d6270e484a4cb7cd52c7504abc6283d 100644
--- a/core/base/CbmHistManager.h
+++ b/core/base/CbmHistManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/CbmMatchRecoToMC.cxx b/core/base/CbmMatchRecoToMC.cxx
index 73ef69bbcfe3425d3e225b38da7dc4f993f09228..548c5436933282c9e21f227bd5f92292aee0e5bb 100644
--- a/core/base/CbmMatchRecoToMC.cxx
+++ b/core/base/CbmMatchRecoToMC.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2021 GSI/JINR-LIT
+/* Copyright (C) 2013-2021 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig, Volker Friese, Pierre-Alain Loizeau */
diff --git a/core/base/CbmMatchRecoToMC.h b/core/base/CbmMatchRecoToMC.h
index 3cc9e2f29980402435d5f2fe592701bed72775fb..a1a24fd3a7f12c7c2d76ef49f02676f9d9c20786 100644
--- a/core/base/CbmMatchRecoToMC.h
+++ b/core/base/CbmMatchRecoToMC.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2021 GSI/JINR-LIT
+/* Copyright (C) 2013-2021 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Volker Friese */
diff --git a/core/base/draw/CbmDrawHist.cxx b/core/base/draw/CbmDrawHist.cxx
index fd3c89030424d3a61fbd9e46a3fb76dff4d8acf8..eae1ebc380f6c85c2cee5cf7a3747e8d54987cfa 100644
--- a/core/base/draw/CbmDrawHist.cxx
+++ b/core/base/draw/CbmDrawHist.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2020 GSI/JINR-LIT
+/* Copyright (C) 2008-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer] */
diff --git a/core/base/draw/CbmDrawHist.h b/core/base/draw/CbmDrawHist.h
index e700198971201b7ae7fe42d7c3bdf850febd92bb..82fba7ddb6fc45bc80732e582b39c71f4cc7617d 100644
--- a/core/base/draw/CbmDrawHist.h
+++ b/core/base/draw/CbmDrawHist.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2020 GSI/JINR-LIT
+/* Copyright (C) 2008-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer] */
diff --git a/core/base/report/CbmHtmlReportElement.cxx b/core/base/report/CbmHtmlReportElement.cxx
index ebe4cb23c0d00c168c5d27b02a8b4f35967d5c4a..8590d5423ff85b7bd080afb6732d8e293c1b020e 100644
--- a/core/base/report/CbmHtmlReportElement.cxx
+++ b/core/base/report/CbmHtmlReportElement.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer] */
diff --git a/core/base/report/CbmHtmlReportElement.h b/core/base/report/CbmHtmlReportElement.h
index 4589c40864544da639ff1936e41020a4e6989428..d58da7f7f9f4253eb6372e308341ec77bf88c209 100644
--- a/core/base/report/CbmHtmlReportElement.h
+++ b/core/base/report/CbmHtmlReportElement.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmLatexReportElement.cxx b/core/base/report/CbmLatexReportElement.cxx
index b170e770e05f81e2188639a106a3b5863e15dfa8..0876bca39faf01b0e7c040aff2340a00c7c8818d 100644
--- a/core/base/report/CbmLatexReportElement.cxx
+++ b/core/base/report/CbmLatexReportElement.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer] */
diff --git a/core/base/report/CbmLatexReportElement.h b/core/base/report/CbmLatexReportElement.h
index bc5f10de61132277244b2ac623264034469490e9..41f12da5442267b85f7cf8724cc04a74cf706256 100644
--- a/core/base/report/CbmLatexReportElement.h
+++ b/core/base/report/CbmLatexReportElement.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmReport.cxx b/core/base/report/CbmReport.cxx
index 40da7276edca00eda13203a9ba00dccf915732cc..d1c25666b85b1c262edaced09c90766a4101c0b6 100644
--- a/core/base/report/CbmReport.cxx
+++ b/core/base/report/CbmReport.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmReport.h b/core/base/report/CbmReport.h
index 5d73572897103c58432bbd9f6d224b2996cfe62b..d531a83e98850cd071a5cfdb43fc3fd01dea771d 100644
--- a/core/base/report/CbmReport.h
+++ b/core/base/report/CbmReport.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmReportElement.h b/core/base/report/CbmReportElement.h
index 0926ff569e84ae2be127e0471952c36204ca5e52..be789c405d59a02373a355cc678360e223fa7b75 100644
--- a/core/base/report/CbmReportElement.h
+++ b/core/base/report/CbmReportElement.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmSimulationReport.cxx b/core/base/report/CbmSimulationReport.cxx
index 63d41b4617e5e17f69ada704fc8657aae4ff8dd1..21c29ff73196e7951efd43af79f80930072d713e 100644
--- a/core/base/report/CbmSimulationReport.cxx
+++ b/core/base/report/CbmSimulationReport.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2021 GSI/JINR-LIT
+/* Copyright (C) 2011-2021 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmSimulationReport.h b/core/base/report/CbmSimulationReport.h
index 8eb7ac87ea912f961cb7204073da08ef59f0864a..c3dc4b484e735171ee51cf9f61a2751e5ce57765 100644
--- a/core/base/report/CbmSimulationReport.h
+++ b/core/base/report/CbmSimulationReport.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmStudyReport.cxx b/core/base/report/CbmStudyReport.cxx
index 7ffc710763c52cf9bfbe73e39b983b52d169c66e..6a390db8a0bf770af9fede76f7a7b2fc9045c245 100644
--- a/core/base/report/CbmStudyReport.cxx
+++ b/core/base/report/CbmStudyReport.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2021 GSI/JINR-LIT
+/* Copyright (C) 2011-2021 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmStudyReport.h b/core/base/report/CbmStudyReport.h
index 0eeb2946a808f36ebefb728882d2f2a3d34877d9..4aa19d5e97358cb2ec5ee13c5410f3147c4ab6c1 100644
--- a/core/base/report/CbmStudyReport.h
+++ b/core/base/report/CbmStudyReport.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmTextReportElement.cxx b/core/base/report/CbmTextReportElement.cxx
index bb2363810e10620191a9176bdbbad4013bf58934..07dec7a14adb03945780159a5472e4244c51e7f3 100644
--- a/core/base/report/CbmTextReportElement.cxx
+++ b/core/base/report/CbmTextReportElement.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/report/CbmTextReportElement.h b/core/base/report/CbmTextReportElement.h
index 58a5b20418c6b8922abeeef05de24c61ba8178f1..43cc122565053d36a5ec18c1d201b8038cea4232 100644
--- a/core/base/report/CbmTextReportElement.h
+++ b/core/base/report/CbmTextReportElement.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2020 GSI/JINR-LIT
+/* Copyright (C) 2011-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/utils/CbmUtils.cxx b/core/base/utils/CbmUtils.cxx
index fbdef1bc20d35a417278874c49ff280e03c34672..b45fab1cf5b69e80d4f7ae2a1c8e413cf7482991 100644
--- a/core/base/utils/CbmUtils.cxx
+++ b/core/base/utils/CbmUtils.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2020 GSI/JINR-LIT
+/* Copyright (C) 2010-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/base/utils/CbmUtils.h b/core/base/utils/CbmUtils.h
index 5031d0145d61241218b926c938a8a2e9180aa9dd..2e7f67f1495f88afa77ad758c4eca1c2274a60ba 100644
--- a/core/base/utils/CbmUtils.h
+++ b/core/base/utils/CbmUtils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2020 GSI/JINR-LIT
+/* Copyright (C) 2010-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/config/CbmConfigBase.h b/core/config/CbmConfigBase.h
index 0c8513cc7ae58968a4431469ed15a36cf773925c..81e28528262fd8b302e4b9ba37fd74cd15708c96 100644
--- a/core/config/CbmConfigBase.h
+++ b/core/config/CbmConfigBase.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Oleg Golosov */
+ Authors: Oleg Golosov [committer] */
#pragma once
diff --git a/core/data/CbmLink.cxx b/core/data/CbmLink.cxx
index 3a70afae86cf42e170a46e419fab5bde32787384..5879185c19d6f79c390bd1d3501839ff76463452 100644
--- a/core/data/CbmLink.cxx
+++ b/core/data/CbmLink.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/data/CbmLink.h b/core/data/CbmLink.h
index 4b2c917719b87340c3b4493fe910dda06c33486a..2823928c4cfbaae9697f7da0d0e8e80814635a47 100644
--- a/core/data/CbmLink.h
+++ b/core/data/CbmLink.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Volker Friese */
diff --git a/core/data/CbmMatch.cxx b/core/data/CbmMatch.cxx
index d1fd6e7c0f892e38d7990065c9c62d194102cea9..ed9a67aaceb203519bd9689c909e7f01833b4443 100644
--- a/core/data/CbmMatch.cxx
+++ b/core/data/CbmMatch.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer] */
diff --git a/core/data/CbmMatch.h b/core/data/CbmMatch.h
index f470ca96f702c40f917d80f39fa22ff14e9cd435..f7fcb7e4004be2cf88e6f1b38a09096f8684d99a 100644
--- a/core/data/CbmMatch.h
+++ b/core/data/CbmMatch.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/data/CbmRawEvent.cxx b/core/data/CbmRawEvent.cxx
index 93a6371a2f626c7bc2ee620b8e09c7c70a0ab90c..cc2c320cd839723f5857bb43df4fa7723b7606bf 100644
--- a/core/data/CbmRawEvent.cxx
+++ b/core/data/CbmRawEvent.cxx
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Volker Friese [committer] */
+
/*
* CbmRawEvent.cxx
*
diff --git a/core/data/CbmRawEvent.h b/core/data/CbmRawEvent.h
index c902606942179556577b582d2ef111016b976224..eafff7d8e0a11f059305ad8f5a24be917edf91b8 100644
--- a/core/data/CbmRawEvent.h
+++ b/core/data/CbmRawEvent.h
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Volker Friese [committer] */
+
/** @file CbmRawEvent.h
** @author Volker Friese <v.friese@gsi.de>
** @date 25.03.2021
diff --git a/core/data/CbmTrackMatchNew.cxx b/core/data/CbmTrackMatchNew.cxx
index eca4d48d46a57301df3ebd2cd6f441f3ec63df06..0f95e839a3d0b0d84b9b0a5570d51cc4a7809f51 100644
--- a/core/data/CbmTrackMatchNew.cxx
+++ b/core/data/CbmTrackMatchNew.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/data/CbmTrackMatchNew.h b/core/data/CbmTrackMatchNew.h
index 4f1a3a7e3145a4c5b9e5732832d7d3019e296288..b8a7191f259ace5ca299478a2cd193393b52caa3 100644
--- a/core/data/CbmTrackMatchNew.h
+++ b/core/data/CbmTrackMatchNew.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/data/CbmTsEventHeader.cxx b/core/data/CbmTsEventHeader.cxx
index 360500d8e550d3fdf9fccb95d357bfaca11c8775..567608421466dc3e8d8dafb8b18ad861391e7ab9 100644
--- a/core/data/CbmTsEventHeader.cxx
+++ b/core/data/CbmTsEventHeader.cxx
@@ -1,6 +1,6 @@
-/* Copyright (C) 2010 - 2021 Goethe-University Frankfurt
+/* Copyright (C) 2021 Goethe-University Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Pascal Raisig */
+ Authors: Pascal Raisig [committer] */
#include "CbmTsEventHeader.h"
diff --git a/core/data/CbmTsEventHeader.h b/core/data/CbmTsEventHeader.h
index 422096e804f04f276919a2922bdbd06e9137c2f9..0f36e29e3ff60a4b823f4f44304bc74d793522b9 100644
--- a/core/data/CbmTsEventHeader.h
+++ b/core/data/CbmTsEventHeader.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2010 - 2021 Goethe-University Frankfurt
+/* Copyright (C) 2021 Goethe-University Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Pascal Raisig */
+ Authors: Pascal Raisig [committer] */
#ifndef CbmTsEventHeader_H
#define CbmTsEventHeader_H
diff --git a/core/data/much/CbmMuchPixelHit.cxx b/core/data/much/CbmMuchPixelHit.cxx
index aad2862b1717f99653e38d422b525d8dd97c0eb3..44bf6ad3df1665fb2fb9d820500e52acd9538dba 100644
--- a/core/data/much/CbmMuchPixelHit.cxx
+++ b/core/data/much/CbmMuchPixelHit.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2020 GSI/JINR-LIT
+/* Copyright (C) 2009-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Florian Uhlig, Mikhail Ryzhinskiy */
diff --git a/core/data/much/CbmMuchPixelHit.h b/core/data/much/CbmMuchPixelHit.h
index eab46e9f7ae9288f3529af84d29d6a802b2b16c7..8c7cd230f07c081f4b9d6caf087ac63c7f285bab 100644
--- a/core/data/much/CbmMuchPixelHit.h
+++ b/core/data/much/CbmMuchPixelHit.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2020 GSI/JINR-LIT
+/* Copyright (C) 2009-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Andrey Lebedev [committer], Mikhail Ryzhinskiy */
diff --git a/core/data/raw/PsdGbtDataFormat-v0.00.h b/core/data/raw/PsdGbtDataFormat-v0.00.h
index 1ffd759bb36faef75c4ca42e1b14f0341a7985ba..672647f219bcda2c7b1e1047bdc97b2fb56c7271 100644
--- a/core/data/raw/PsdGbtDataFormat-v0.00.h
+++ b/core/data/raw/PsdGbtDataFormat-v0.00.h
@@ -1,13 +1,6 @@
-/* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2019-2021 Institute for Nuclear Research, Moscow
SPDX-License-Identifier: GPL-3.0-only
- Authors: Nikolay Karpushkin, David Emschermann [committer] */
-
-// -----------------------------------------------------------------------------
-// ----- -----
-// ----- PsdGbtDataFormat -----
-// ----- Created 14.09.2019 by N.Karpushkin -----
-// ----- -----
-// -----------------------------------------------------------------------------
+ Authors: Nikolay Karpushkin [committer]*/
#ifndef PSD_GBT_DATA_FORMAT_H_
#define PSD_GBT_DATA_FORMAT_H_
diff --git a/core/data/raw/PsdGbtDataFormat-v1.00.h b/core/data/raw/PsdGbtDataFormat-v1.00.h
index 0e413eac20f4761104deddd4b41b7fc51031402a..67320bb3a3a11bf7eba475a071aec12648fc756a 100644
--- a/core/data/raw/PsdGbtDataFormat-v1.00.h
+++ b/core/data/raw/PsdGbtDataFormat-v1.00.h
@@ -1,9 +1,6 @@
-// -----------------------------------------------------------------------------
-// ----- -----
-// ----- PsdGbtDataFormat -----
-// ----- Created 14.09.2019 by N.Karpushkin -----
-// ----- Version 1.00 -----
-// -----------------------------------------------------------------------------
+/* Copyright (C) 2019-2021 Institute for Nuclear Research, Moscow
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Nikolay Karpushkin [committer]*/
#ifndef PSD_GBT_DATA_FORMAT_V100_H_
#define PSD_GBT_DATA_FORMAT_V100_H_
diff --git a/core/data/raw/PsdGbtReader-v0.00.cxx b/core/data/raw/PsdGbtReader-v0.00.cxx
index e1ec77989c9a78b2ea89787a401861393e7fbb58..adec62897edb4ed9077270da30420362158adc74 100644
--- a/core/data/raw/PsdGbtReader-v0.00.cxx
+++ b/core/data/raw/PsdGbtReader-v0.00.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Nikolay Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
+ Authors: Nikolay Karpushkin [committer], David Emschermann, Pierre-Alain Loizeau */
// -----------------------------------------------------------------------------
// ----- -----
diff --git a/core/data/raw/PsdGbtReader-v0.00.h b/core/data/raw/PsdGbtReader-v0.00.h
index 743e3e2f81ccc66345df3b6f085fe4d391d2defe..2697d2543119247cb352782f5d8e5c62d8969ab6 100644
--- a/core/data/raw/PsdGbtReader-v0.00.h
+++ b/core/data/raw/PsdGbtReader-v0.00.h
@@ -1,13 +1,6 @@
-/* Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2019-2021 Institute for Nuclear Research, Moscow
SPDX-License-Identifier: GPL-3.0-only
- Authors: Nikolay Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau */
-
-// -----------------------------------------------------------------------------
-// ----- -----
-// ----- PsdGbtDataReader -----
-// ----- Created 14.09.2019 by N.Karpushkin -----
-// ----- -----
-// -----------------------------------------------------------------------------
+ Authors: Nikolay Karpushkin [committer], David Emschermann, Pierre-Alain Loizeau*/
#ifndef PSD_GBT_READER_V000_H
#define PSD_GBT_READER_V000_H
diff --git a/core/data/raw/PsdGbtReader-v1.00.cxx b/core/data/raw/PsdGbtReader-v1.00.cxx
index 1a746e2a24fe4d4c78e57cd4fd5258971a844033..78db7b64c5fa98bfb650867e9945332471617d5d 100644
--- a/core/data/raw/PsdGbtReader-v1.00.cxx
+++ b/core/data/raw/PsdGbtReader-v1.00.cxx
@@ -1,9 +1,6 @@
-// -----------------------------------------------------------------------------
-// ----- -----
-// ----- PsdGbtDataReader -----
-// ----- Created 14.09.2019 by N.Karpushkin -----
-// ----- -----
-// -----------------------------------------------------------------------------
+/* Copyright (C) 2019-2021 Institute for Nuclear Research, Moscow
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Nikolay Karpushkin [committer]*/
#include "PsdGbtReader-v1.00.h"
diff --git a/core/data/raw/PsdGbtReader-v1.00.h b/core/data/raw/PsdGbtReader-v1.00.h
index 5d7ed091aaf6155e9387f4294b817ed24d001e14..650259750ba680dcaa7c84c41136e4844e6f5425 100644
--- a/core/data/raw/PsdGbtReader-v1.00.h
+++ b/core/data/raw/PsdGbtReader-v1.00.h
@@ -1,9 +1,6 @@
-// -----------------------------------------------------------------------------
-// ----- -----
-// ----- PsdGbtDataReader -----
-// ----- Created 14.09.2019 by N.Karpushkin -----
-// ----- -----
-// -----------------------------------------------------------------------------
+/* Copyright (C) 2019-2021 Institute for Nuclear Research, Moscow
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Nikolay Karpushkin [committer]*/
#ifndef PSD_GBT_READER_V100_H
#define PSD_GBT_READER_V100_H
diff --git a/core/data/raw/bitmask_operators.hpp b/core/data/raw/bitmask_operators.hpp
index 76f5226037c78f8f826a3bb6606306cee5830cb3..90d84bc32049a2dadee707a29579907583d7500d 100644
--- a/core/data/raw/bitmask_operators.hpp
+++ b/core/data/raw/bitmask_operators.hpp
@@ -1,3 +1,7 @@
+/* Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef JSS_BITMASK_HPP
#define JSS_BITMASK_HPP
diff --git a/core/data/rich/CbmRichDigi.cxx b/core/data/rich/CbmRichDigi.cxx
index 88ba2eabc9c87cb4179b883bdb6bc85457e68f2b..e13e53ce1632794ba34bf589ba8839be8e3ca5c5 100644
--- a/core/data/rich/CbmRichDigi.cxx
+++ b/core/data/rich/CbmRichDigi.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2019 GSI/JINR-LIT
+/* Copyright (C) 2015-2019 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Volker Friese */
diff --git a/core/data/rich/CbmRichDigi.h b/core/data/rich/CbmRichDigi.h
index e32dbaba45b7784bf8432dc3e401d5e3cd90b581..6321d62ad8c4a81cf26269ff4e96fd84395681a8 100644
--- a/core/data/rich/CbmRichDigi.h
+++ b/core/data/rich/CbmRichDigi.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Volker Friese, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/data/rich/CbmRichRingLight.h b/core/data/rich/CbmRichRingLight.h
index 4103bfa73d9ca7a09429660e0277d79a5d2f8a18..0d94ef4663dbc125f789148cc06320ee5c8ed93a 100644
--- a/core/data/rich/CbmRichRingLight.h
+++ b/core/data/rich/CbmRichRingLight.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2019 UGiessen, JINR-LIT
+/* Copyright (C) 2010-2019 UGiessen/JINR-LIT, Giessen/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev [committer] */
diff --git a/core/data/sts/CbmStsAddress.cxx b/core/data/sts/CbmStsAddress.cxx
index 0365973915379d6601e6d66a7d76d32f2d8f0f66..a7e55fb61077f1dbf548f511baa8e41a8899260f 100644
--- a/core/data/sts/CbmStsAddress.cxx
+++ b/core/data/sts/CbmStsAddress.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Volker Friese, Andrey Lebedev [committer] */
diff --git a/core/data/sts/CbmStsAddress.h b/core/data/sts/CbmStsAddress.h
index aef1f6d7c4a0fb2ce09d5d50566038dc42089c48..454e7488e8ebaf9f9232a0c309372e0fa27a511a 100644
--- a/core/data/sts/CbmStsAddress.h
+++ b/core/data/sts/CbmStsAddress.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Volker Friese, Andrey Lebedev [committer] */
diff --git a/core/data/sts/CbmStsHit.cxx b/core/data/sts/CbmStsHit.cxx
index da5b36341b9de3a01b61745feaa4cbe1ad24adaf..2ecee11c1944fdd1a4c5e63d35a4d6ce8d15e00e 100644
--- a/core/data/sts/CbmStsHit.cxx
+++ b/core/data/sts/CbmStsHit.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Volker Friese, Florian Uhlig, Andrey Lebedev */
+ Authors: Volker Friese [committer], Florian Uhlig, Andrey Lebedev */
/**
** \file CbmStsHit.cxx
diff --git a/core/data/trd/CbmTrdAddress.cxx b/core/data/trd/CbmTrdAddress.cxx
index 507162fb615a4e2e7ced300cb8940b55e1d2408a..6187d04615af37063bd33da34574aebdaa8bcd50 100644
--- a/core/data/trd/CbmTrdAddress.cxx
+++ b/core/data/trd/CbmTrdAddress.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 GSI/JINR-LIT
+/* Copyright (C) 2013 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Florian Uhlig, Andrey Lebedev [committer] */
diff --git a/core/data/trd/CbmTrdHit.cxx b/core/data/trd/CbmTrdHit.cxx
index fc788f433bd484871d8f63e704b0e45dab9571ed..1a23ab122168ec4d646db89ff5d75ac6888bc81b 100644
--- a/core/data/trd/CbmTrdHit.cxx
+++ b/core/data/trd/CbmTrdHit.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Florian Uhlig, Denis Bertini [committer], Andrey Lebedev */
+ Authors: Matus Kalisky [committer], Florian Uhlig, Andrey Lebedev */
/**
* \file CbmTrdHit.cxx
diff --git a/core/data/trd/CbmTrdHit.h b/core/data/trd/CbmTrdHit.h
index 4fedacc83187114e5bfe5ddcc755f003024203cd..5b24930c02bc6c8e1538885eb90779dcf1423b56 100644
--- a/core/data/trd/CbmTrdHit.h
+++ b/core/data/trd/CbmTrdHit.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Florian Uhlig, Andrey Lebedev */
+ Authors: Matus Kalisky [committer], Florian Uhlig, Andrey Lebedev */
/**
* \file CbmTrdHit.h
diff --git a/core/detectors/much/CbmMuchSegmentAuto.cxx b/core/detectors/much/CbmMuchSegmentAuto.cxx
index a327b5f29bbad92f37ec20e2d3704706cfc8e1e3..60a48f3b7b6deb1c4967bd6b2e85854e8d1b3bf2 100644
--- a/core/detectors/much/CbmMuchSegmentAuto.cxx
+++ b/core/detectors/much/CbmMuchSegmentAuto.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Mikhail Ryzhinskiy, Florian Uhlig */
+ Authors: Mikhail Ryzhinskiy [committer], Florian Uhlig */
/** CbmMuchSegmentAuto.cxx
*@author Mikhail Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/much/CbmMuchSegmentAuto.h b/core/detectors/much/CbmMuchSegmentAuto.h
index f3a25c7eae206614728510e23cff65af39102180..c0eb943a4d3a723945b462473d1a159995e0fad3 100644
--- a/core/detectors/much/CbmMuchSegmentAuto.h
+++ b/core/detectors/much/CbmMuchSegmentAuto.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Mikhail Ryzhinskiy, Florian Uhlig, Volker Friese [committer] */
+ Authors: Mikhail Ryzhinskiy [committer], Florian Uhlig, Volker Friese */
/** CbmMuchSegmentAuto.h
*@author Mikhail Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/rich/CbmRichDetectorData.h b/core/detectors/rich/CbmRichDetectorData.h
index 66e05cdd7f9880ea1e6203c13b05bb6b87f5268c..8800dd7a35e21a885fc88f0286ec2e3496d2d947 100644
--- a/core/detectors/rich/CbmRichDetectorData.h
+++ b/core/detectors/rich/CbmRichDetectorData.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/detectors/rich/CbmRichDigiMapManager.cxx b/core/detectors/rich/CbmRichDigiMapManager.cxx
index 537481f3942fc205f14c631fdf21488215c1079e..8b41e9650254bc4705085e9bd975eac5e25914f3 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichDigiMapManager.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Adrian Amatus Weber, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/detectors/rich/CbmRichDigiMapManager.h b/core/detectors/rich/CbmRichDigiMapManager.h
index f07b7b73439019ccc20a25d559ddc7af118c6c76..4c64a82038afc097a5494eee86bebdf4b53a5c55 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.h
+++ b/core/detectors/rich/CbmRichDigiMapManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/detectors/rich/CbmRichDraw.h b/core/detectors/rich/CbmRichDraw.h
index 60b5f5101a3afd7ab72b6fab50c1f5f9bff81718..897be27f742cc6259a6ef21851a35084c5ec8b21 100644
--- a/core/detectors/rich/CbmRichDraw.h
+++ b/core/detectors/rich/CbmRichDraw.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2020 GSI/JINR-LIT
+/* Copyright (C) 2016-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/detectors/rich/CbmRichEventDisplay.h b/core/detectors/rich/CbmRichEventDisplay.h
index 30757e765057a0209e786f5ba8a59589ac669506..779bf39f40e9dcebbf49a2e61e39e8833855f51c 100644
--- a/core/detectors/rich/CbmRichEventDisplay.h
+++ b/core/detectors/rich/CbmRichEventDisplay.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 UGiessen, JINR-LIT
+/* Copyright (C) 2012-2020 UGiessen/JINR-LIT, Giessen/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev [committer] */
diff --git a/core/detectors/rich/CbmRichGeoManager.cxx b/core/detectors/rich/CbmRichGeoManager.cxx
index b8ef9735d0d27b4d64b1221a5ef956ee43f91d39..1a6ff4e630375fe97474999e2afd83c75542b6ef 100644
--- a/core/detectors/rich/CbmRichGeoManager.cxx
+++ b/core/detectors/rich/CbmRichGeoManager.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer] */
diff --git a/core/detectors/rich/CbmRichGeoManager.h b/core/detectors/rich/CbmRichGeoManager.h
index c1eb2cda67d8562cc514f3bb8699690ca63f06c0..af50dfd44ccb7cec1ba70bfe72daaeb5da2cca64 100644
--- a/core/detectors/rich/CbmRichGeoManager.h
+++ b/core/detectors/rich/CbmRichGeoManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer] */
diff --git a/core/detectors/rich/CbmRichPmt.cxx b/core/detectors/rich/CbmRichPmt.cxx
index 7280b8f063b7cdf7ebcc42c7341b0289ef267be9..50e1fd59eff6e30372c14b1c6d2f1c3acfb5846f 100644
--- a/core/detectors/rich/CbmRichPmt.cxx
+++ b/core/detectors/rich/CbmRichPmt.cxx
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer] */
diff --git a/core/detectors/rich/CbmRichPmt.h b/core/detectors/rich/CbmRichPmt.h
index 8c226ec79d64e5639171052b19fd8ed6d6736db3..ea3009043a05162c7029013f8bd9731366e013df 100644
--- a/core/detectors/rich/CbmRichPmt.h
+++ b/core/detectors/rich/CbmRichPmt.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2020 GSI/JINR-LIT
+/* Copyright (C) 2015-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/detectors/rich/CbmRichPmtType.h b/core/detectors/rich/CbmRichPmtType.h
index 782a949d124c4203a9c90a58be93cbfea26fa169..2a2505a7441f63d5c864d6616849b9437063d486 100644
--- a/core/detectors/rich/CbmRichPmtType.h
+++ b/core/detectors/rich/CbmRichPmtType.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2017 UGiessen, JINR-LIT
+/* Copyright (C) 2017 UGiessen/JINR-LIT, Giessen/Dubna
SPDX-License-Identifier: GPL-3.0-only
- Authors: Semen Lebedev */
+ Authors: Semen Lebedev [committer] */
/*
* CbmRichPmtType.h
diff --git a/core/detectors/rich/CbmRichRecGeoPar.h b/core/detectors/rich/CbmRichRecGeoPar.h
index 97fe955eaeac0f5a6fe8bbbb875ba9a12e735fc2..c2ebab1a7350b14bdc1fa45551535b4f7a1a3e67 100644
--- a/core/detectors/rich/CbmRichRecGeoPar.h
+++ b/core/detectors/rich/CbmRichRecGeoPar.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2020 GSI/JINR-LIT
+/* Copyright (C) 2013-2020 GSI/JINR-LIT, Darmstadt/Dubna
SPDX-License-Identifier: GPL-3.0-only
Authors: Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig */
diff --git a/core/detectors/sts/CbmStsContFact.cxx b/core/detectors/sts/CbmStsContFact.cxx
index 1e486511b0906f70ae93e8e3c8cde660011304c4..0cbfd2c9bf98e9da8db5541ce1c2f06daf8a794e 100644
--- a/core/detectors/sts/CbmStsContFact.cxx
+++ b/core/detectors/sts/CbmStsContFact.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Denis Bertini, Volker Friese, Florian Uhlig */
+ Authors: Denis Bertini [committer], Volker Friese, Florian Uhlig */
/** @file CbmStsContFact.cxx
** @author Denis Bertini <d.bertini@gsi.de>
diff --git a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h
index 299d922dd63103dac774f35fc08ee9eb3c567888..dad80efbaa6d8822b3e7f162ab7a18e6b7e10da2 100644
--- a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h
+++ b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Pascal Raisig */
+ Authors: Pascal Raisig [committer] */
#ifndef CbmMcbm2020TrdTshiftPar_H
#define CbmMcbm2020TrdTshiftPar_H
diff --git a/core/detectors/trd/CbmTrdRadiator.cxx b/core/detectors/trd/CbmTrdRadiator.cxx
index 4aa9a4429a59c56f80a053ad87d7d2a357fcf6ca..acf493dcb3965467b86635dfe9583a460c628c13 100644
--- a/core/detectors/trd/CbmTrdRadiator.cxx
+++ b/core/detectors/trd/CbmTrdRadiator.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Matus Kalisky, Cyrano Bergmann, Adrian Meyer-Ahrens, David Emschermann, Florian Uhlig */
+ Authors: Matus Kalisky [committer], Cyrano Bergmann, Adrian Meyer-Ahrens, David Emschermann, Florian Uhlig */
// ------------------------------------------------------------------------
// ----- CbmTrdRadiator source file -----
diff --git a/core/detectors/trd/CbmTrdRadiator.h b/core/detectors/trd/CbmTrdRadiator.h
index d8f1104cec2e0f7503dbcdf5a20b709229a94afa..0d802d57f40f062cfee2ee0eda82f73ae05fc0a4 100644
--- a/core/detectors/trd/CbmTrdRadiator.h
+++ b/core/detectors/trd/CbmTrdRadiator.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Matus Kalisky, Adrian Meyer-Ahrens, Denis Bertini [committer], Cyrano Bergmann, Florian Uhlig */
+ Authors: Matus Kalisky [committer], Adrian Meyer-Ahrens, Cyrano Bergmann, Florian Uhlig */
// -------------------------------------------------------------------------
// ----- CbmTrdRadiator header file -----
diff --git a/core/detectors/trd/CbmTrdSpadic.cxx b/core/detectors/trd/CbmTrdSpadic.cxx
index f49e1670233b80d79fbf71fc6c04dcf311331f72..414ea0f86e4d22d6c1670edfd934ee40af8aaec4 100644
--- a/core/detectors/trd/CbmTrdSpadic.cxx
+++ b/core/detectors/trd/CbmTrdSpadic.cxx
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Goethe-University Frankfurt, Frankfurt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pascal Raisig [committer] */
+
#include "CbmTrdSpadic.h"
#include <RtypesCore.h>
diff --git a/core/detectors/trd/CbmTrdSpadic.h b/core/detectors/trd/CbmTrdSpadic.h
index 5d44a40893a3a51a00ddeb1fda89f8911673d238..36d7f0d17a66808f134f0f693d39c75272a3e4ce 100644
--- a/core/detectors/trd/CbmTrdSpadic.h
+++ b/core/detectors/trd/CbmTrdSpadic.h
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Goethe-University Frankfurt, Frankfurt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pascal Raisig [committer] */
+
/**
* @file CbmTrdSpadic.h
* @author Pascal Raisig (praisig@ikf.uni-frankfurt.de)
diff --git a/core/detectors/trd/CbmTrddEdxUtils.cxx b/core/detectors/trd/CbmTrddEdxUtils.cxx
index a853a68467dda77fa3de8aa202ae07c1562dcb9c..07e54e216d2c1ef0221c66eddbcee8ef5baa7edf 100644
--- a/core/detectors/trd/CbmTrddEdxUtils.cxx
+++ b/core/detectors/trd/CbmTrddEdxUtils.cxx
@@ -1,6 +1,6 @@
-/* Copyright (C) 2010 - 2021 Goethe-University Frankfurt
+/* Copyright (C) 2021 Goethe-University Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Pascal Raisig */
+ Authors: Pascal Raisig [committer] */
#include "CbmTrddEdxUtils.h"
diff --git a/core/detectors/trd/CbmTrddEdxUtils.h b/core/detectors/trd/CbmTrddEdxUtils.h
index 2d4399322ded67984c8d6de5b8c6a41a87120d2d..d6f2bf7fda236b5742dc7f4f6c2ad7b59424d994 100644
--- a/core/detectors/trd/CbmTrddEdxUtils.h
+++ b/core/detectors/trd/CbmTrddEdxUtils.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2010 - 2021 Goethe-University Frankfurt
+/* Copyright (C) 2021 Goethe-University Frankfurt, Frankfurt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Pascal Raisig */
+ Authors: Pascal Raisig [committer] */
/**
* @file CbmTrddEdxUtils.h
diff --git a/core/eventdisplay/CbmRecoTracks.cxx b/core/eventdisplay/CbmRecoTracks.cxx
index c017d641b7d57befe6a8f1b9b31c2523fbe71af6..2df8182009497fda4f5240c19f2cdd608c4054bb 100644
--- a/core/eventdisplay/CbmRecoTracks.cxx
+++ b/core/eventdisplay/CbmRecoTracks.cxx
@@ -1,3 +1,7 @@
+/* Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Timur Ablyazimov [committer] */
+
/********************************************************************************
* Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
diff --git a/core/eventdisplay/CbmRecoTracks.h b/core/eventdisplay/CbmRecoTracks.h
index 28ed776939e31f3c2a1024bfe197407ef35c2c48..b507f85946522f33c45509b94756548fefd8878a 100644
--- a/core/eventdisplay/CbmRecoTracks.h
+++ b/core/eventdisplay/CbmRecoTracks.h
@@ -1,3 +1,7 @@
+/* Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Timur Ablyazimov [committer] */
+
/********************************************************************************
* Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *