diff --git a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
index 71471d71354ec9acb8668baeab26abcd0d6accd6..c794152ff74b428101cb2ab1a00984de598c1bc9 100644
--- a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
+++ b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2021 GSI, IKF-UFra
SPDX-License-Identifier: GPL-3.0-only
- Authors: Florian Uhlig */
+ Authors: Florian Uhlig [committer] */
#ifdef __CINT__
diff --git a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
index 15a406c72dd3f828a366dd31b30ee69d3c90dd28..0fa600f9d00af6da6cc83bd0257ad3a02ca5c129 100644
--- a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2021 GSI/IKF-UFra, Darmstadt/Frankfurt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Alberica Toia [committer] */
+
#include "CbmStsCoincHodo.h"
#include "CbmStsCluster.h"
diff --git a/fles/cosy2019/unpacker/CbmStsCoincHodo.h b/fles/cosy2019/unpacker/CbmStsCoincHodo.h
index 9144b6cbbd7e6696671a3144af34a204b4e6ca37..e561612771de6cebfdaabf6b15fe71f4ee316065 100644
--- a/fles/cosy2019/unpacker/CbmStsCoincHodo.h
+++ b/fles/cosy2019/unpacker/CbmStsCoincHodo.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2021 GSI/IKF-UFra, Darmstadt/Frankfurt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Alberica Toia [committer] */
+
#ifndef CBMCHECKCOINCHODO_H
#define CBMCHECKCOINCHODO_H
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
index 10901456f7ee585877b9786519435893eca3eb29..59542699a52735ffff90ac7125222a7d12879787 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Variable Energy Cyclotron Centre, Kolkata
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Vikas Singhal [committer] */
+
#include "CbmMcbm2018MonitorAlgoMuchLite.h"
// Data
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.h
index 92f6916e2886d8ce0752e3b1d199cf708f88b59f..010a4b73157f25a7da96a686b1bb367bdc227b32 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.h
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Variable Energy Cyclotron Centre, Kolkata
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Vikas Singhal [committer] */
+
// -----------------------------------------------------------------------------
// ----- -----
// ----- CbmMcbm2018MonitorMuchLite -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
index 1a8d017aed816ed2c9a7f52e87398d9ef35aca8d..d451d443bd4c5237b89ab5ada94c57466ffb74fb 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Variable Energy Cyclotron Centre, Kolkata
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Vikas Singhal [committer] */
+
#include "CbmMcbm2018MonitorTaskMuchLite.h"
#include "CbmMcbm2018MonitorAlgoMuchLite.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.h
index dd320252a160eca0f4e88ed87d7b2f435ee5b037..c297436dc2378e21f3d58408942d3103e469589c 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.h
@@ -1,3 +1,7 @@
+/* Copyright (C) 2021 Variable Energy Cyclotron Centre, Kolkata
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Vikas Singhal [committer] */
+
// -----------------------------------------------------------------------------
// ----- -----
// ----- CbmMcbm2018MonitorMuchLite -----
diff --git a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
index 54ce207a55cec5cbbfd67d3f6d77ffbc7f831eba..2529f13e789f581272bdf29a4f986bf6bb45a73c 100644
--- a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmCheckDigisNbCorr.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.h b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.h
index b60729b168bb679ee11059d4aa5d52f4f43cab4c..fda3a7ccb9d5c19a2c747aac6a032b559ed78909 100644
--- a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.h
+++ b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMCHECKDIGISNBCORR_H
#define CBMCHECKDIGISNBCORR_H
diff --git a/fles/mcbm2018/tasks/CbmCheckEvents.cxx b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
index ed07504d97948884bbd71e9479c0956bf415d439..b00099bd38b26415276c07d826f01793efb605bf 100644
--- a/fles/mcbm2018/tasks/CbmCheckEvents.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Florian Uhlig [committer] */
+
#include "CbmCheckEvents.h"
//#include "CbmTofDigi.h"
diff --git a/fles/mcbm2018/tasks/CbmCheckEvents.h b/fles/mcbm2018/tasks/CbmCheckEvents.h
index 024a0d89bbefa0f24b46c62c0db35c417ceb41ba..26cda0823997fff6b4c3cc421eda25a13a8a7c42 100644
--- a/fles/mcbm2018/tasks/CbmCheckEvents.h
+++ b/fles/mcbm2018/tasks/CbmCheckEvents.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Florian Uhlig [committer] */
+
#ifndef CBMCHECKEVENTS_H
#define CBMCHECKEVENTS_H
diff --git a/fles/mcbm2018/tasks/CbmCheckTiming.cxx b/fles/mcbm2018/tasks/CbmCheckTiming.cxx
index d94e6d7a23572885d653f23d67fef8269fbba956..60e25296af56c1c069a137f018ec29bc7ff2de09 100644
--- a/fles/mcbm2018/tasks/CbmCheckTiming.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckTiming.cxx
@@ -1,10 +1,7 @@
-#/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau, Florian Uhlig [committer], Andreas Redelbach */
+
#include "CbmCheckTiming.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmCheckTiming.h b/fles/mcbm2018/tasks/CbmCheckTiming.h
index cfc3467de3849e2d5391428cea34a7ac93fbe42c..391b7b446e4654dbe68272d1b7e3337b2d7b491b 100644
--- a/fles/mcbm2018/tasks/CbmCheckTiming.h
+++ b/fles/mcbm2018/tasks/CbmCheckTiming.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Florian Uhlig [committer], Pierre-Alain Loizeau, Andreas Redelbach */
+
#ifndef CBMCHECKTIMING_H
#define CBMCHECKTIMING_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
index 35bf18aa8a8dcda607b10210f7109b4376c6bf86..f745a308bb70ecfacd8c85affdbe1e95628eff57 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Florian Uhlig [committer] */
+
#include "CbmMcbm2018EventBuilder.h"
#include "CbmMuchBeamTimeDigi.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.h b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.h
index 7188547941db574ddaf499a8efad4f0fcef07a35..20065dfac12d7fd63a136ed08c458c4ab008680f 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Florian Uhlig [committer] */
+
#ifndef CBMMCBM2018EVENTBUILDER_H
#define CBMMCBM2018EVENTBUILDER_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
index 75df285d3122ba1dc98cc97901964b18e4c68775..8bf2676ea8acbbe2f8f30b988c47bfbd6de4d2e4 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019CheckDigisMuch.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.h b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.h
index 6b15b399a28c894c4d825c3de28e3cf3dea191b8..9ba7721d59848629578f96ab8a9462feed74cd51 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019CHECKDIGISMUCH_H
#define CBMMCBM2019CHECKDIGISMUCH_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
index 1b4a4882e7075d33bde63c4df4ca835f7a0c9c78..cfed8380789b79e13f0a3004e418f7656553a99b 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019CheckDigisSts.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.h b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.h
index 4188c4ccc8da4274f486129f673ce8a4542197f2..7abe546c36a70add30360ed0727b44d71c4fbd4c 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019CHECKDIGISSTS_H
#define CBMMCBM2019CHECKDIGISSTS_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
index e4919fe53c49f1c36dc50ee7856e49b74a86c169..162077172a1f02ef00fed21a126adac0d17a3501 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019CheckDtInDet.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.h b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.h
index fff9ad30fc7131a7d89621105dbaae3d219a1180..75e06bdebcf0cae785c00d7dd04ef763b2578451 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019CHECKDTINDET_H
#define CBMMCBM2019CHECKDTINDET_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
index 399e7a90f7bf2c188f00ecba26c1ec82b7cde638..15a91d4d62b5e57258f56177e95727da8a59dddf 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019CheckPulser.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.h b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.h
index 6f2c9080b687e6d59fbd093e6986b4143bb97f81..b1b637e94ac0d6faced7fcbdd81aa1b54ef69710 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019CHECKPULSER_H
#define CBMMCBM2019CHECKPULSER_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
index 12d884a711bd0d07fd4f18628679c19c94633e7f..278f1ff6847db953b35e9eea104aa1d1b48b3b03 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019CheckTimingPairs.h"
#include "CbmDigiManager.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.h b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.h
index eb3e0d2056b5693ac233e23d61d1bf7e7e0aa26c..ac85b3d631ec083bdb6759d4531cc53151f0982d 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019CHECKTIMINGPAIRS_H
#define CBMMCBM2019CHECKTIMINGPAIRS_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
index 7bf841134ea565b604bef0452d7c31cb2ca6b07f..700263b917d2955e2592593b345981fccaee0595 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019TimeWinEventBuilderAlgo.h"
/// CBM headers
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
index e0eea9bc6dbd288534635b8765553f086d5157d5..ab64de05c23ec327639990b0f65466e1fe1957ef 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019TIMEWINEVENTBUILDERALGO_H
#define CBMMCBM2019TIMEWINEVENTBUILDERALGO_H
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
index 4187195c77cee3ac7556c711794e0a4a869522f1..017590aa90fe085fc09aa8067b34b0112e4fd32e 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbm2019TimeWinEventBuilderTask.h"
#include "CbmEvent.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h
index 27397331ae0a0a4de312647ad244333b690f2ab0..25b03f78846ba4a7fd7dec8f3e25d40f51636086 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBM2019TIMEWINEVENTBUILDERTASK_H
#define CBMMCBM2019TIMEWINEVENTBUILDERTASK_H
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
index 0f5a7d343fefec688bb79ee67f5d7aa2a7f5620b..52ef5cac8a28ce2391072ccf73a9c001442af0b5 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#include "CbmMcbmCheckTimingTask.h"
/// CBM headers
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.h b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.h
index 6e081e03d72ba54e4feeee10c65c184b0ec08ed6..2ede5ce42a253adc2a2341a2743ae5244cac4692 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.h
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.h
@@ -1,10 +1,7 @@
-/********************************************************************************
- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
- * *
- * This software is distributed under the terms of the *
- * GNU Lesser General Public Licence (LGPL) version 3, *
- * copied verbatim in the file "LICENSE" *
- ********************************************************************************/
+/* Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Pierre-Alain Loizeau [committer] */
+
#ifndef CBMMCBMCHECKTIMINGTASK_H
#define CBMMCBMCHECKTIMINGTASK_H
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
index ce0859f237880a7dff3e8c4b72631f0d7cd224a3..540771e020278383cde7c4d0d29035d23dba982f 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Pierre-Alain Loizeau */
+ Authors: Pierre-Alain Loizeau [committer] */
// -----------------------------------------------------------------------------
// ----- -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
index 7c276ce1152c4d7cd4bb323e34eb49bf374bbed0..f8d7ae6f3f13abf913645305d54acd57f7cac8c5 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
@@ -1,6 +1,6 @@
-/* Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
+/* Copyright (C) 2021 Justus-Liebig-Universitaet Giessen, Giessen
SPDX-License-Identifier: GPL-3.0-only
- Authors: Egor Ovcharenko [committer], Pierre-Alain Loizeau */
+ Authors: Semen Lebedev [committer] */
/**
* CbmMcbm2018UnpackerAlgoRich20202020
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.h
index de1446482c33f58e2a4caad99868e73f40d15020..fd9599a27c94b2b4e9797887171a4dfedaa687ca 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
+/* Copyright (C) 2021 Justus-Liebig-Universitaet Giessen, Giessen
SPDX-License-Identifier: GPL-3.0-only
- Authors: Egor Ovcharenko [committer] */
+ Authors: Semen Lebedev [committer] */
/**
* CbmMcbm2018UnpackerAlgoRich2020
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
index 448269f82d99d897767002e4b011f3eee19a8baf..06fd3dc1f45061363121ed974a2f1644b48b1d87 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
SPDX-License-Identifier: GPL-3.0-only
- Authors: Egor Ovcharenko [committer], Pierre-Alain Loizeau */
+ Authors: Egor Ovcharenko [committer] */
/**
* CbmMcbm2018UnpackerTaskRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
index c8c488391d6adb355e97e95cd4008952bd92ec0c..927387f12e93d748825f9f41c8cd30e15b63a9b4 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
@@ -1,6 +1,6 @@
/* Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
SPDX-License-Identifier: GPL-3.0-only
- Authors: Egor Ovcharenko [committer], Pierre-Alain Loizeau */
+ Authors: Egor Ovcharenko [committer] */
/**
* CbmMcbm2018UnpackerTaskRich