Cleanup code owners

CODEOWNERS

@@ -10,18 +10,18 @@
 /fles/  @f.uhlig @p.-a.loizeau
 /macro/ @f.uhlig @p.-a.loizeau
 
-/macro/C2F/      @i.selyuzhenkov
-/macro/analysis/ @i.selyuzhenkov
-/macro/KF/       @se.gorbunov @v.akishina
+/macro/C2F/      @a.andronic @k.piasecki
+/macro/analysis/ @a.andronic @k.piasecki
+/macro/KF/       @se.gorbunov
 
 # Core
 /core/             @f.uhlig @v.friese @p.-a.loizeau
 /core/qa/          @se.gorbunov @s.zharko
 /core/data/test/   @f.uhlig
 /core/data/raw/    @p.-a.loizeau
-/core/base/utils/  @f.uhlig @s.lebedev
-/core/base/report/ @s.lebedev
-/core/base/draw/   @s.lebedev
+/core/base/utils/  @f.uhlig
+/core/base/report/ @f.uhlig
+/core/base/draw/   @f.uhlig
 
 # Algo
 /algo/ @d.smith @fweig
@@ -32,23 +32,23 @@
 
 # Reco
 /reco/              @f.uhlig @v.friese @p.-a.loizeau
-/reco/littrack/     @s.lebedev @andrey.lebedev
+/reco/littrack/     @se.gorbunov
 /reco/L1/           @se.gorbunov @s.zharko
 /reco/eventbuilder/ @d.smith
 /reco/KF/           @se.gorbunov @s.zharko
 
 # Analysis
-/analysis/                                 @i.selyuzhenkov
+/analysis/                                 @a.andronic @k.piasecki
 /analysis/PWGC2F/femtoscopy/               @wielanek_AT_if.pw.edu.pl
-/analysis/common/                          @i.selyuzhenkov
-/analysis/PWGHAD/                          @i.selyuzhenkov
-/analysis/PWGCHA/                          @i.selyuzhenkov
-/analysis/PWGDIL/                          @i.selyuzhenkov
+/analysis/common/                          @a.andronic @k.piasecki
+/analysis/PWGHAD/                          @a.andronic @k.piasecki
+/analysis/PWGCHA/                          @a.andronic @k.piasecki
+/analysis/PWGDIL/                          @a.andronic @k.piasecki
 /analysis/PWGDIL/dielectron/pi0eta/        @c.pauly
 /analysis/PWGDIL/dielectron/papaframework/ @a_meye37_AT_uni-muenster.de
-/analysis/PWGDIL/dielectron/lmvm/          @i.selyuzhenkov
+/analysis/PWGDIL/dielectron/lmvm/          @a.andronic @k.piasecki
 /analysis/PWGDIL/dielectron/conversion/    @c.pauly
-/analysis/PWGDIL/dimuon/                   @i.selyuzhenkov
+/analysis/PWGDIL/dimuon/                   @a.andronic @k.piasecki
 
 ## Detectors
 
@@ -62,20 +62,20 @@
 /algo/detectors/trd/  @a.bercuci @p.kaehler
 
 # PSD
-/analysis/detectors/psd/ @karpushkin_AT_inr.ru
-/core/data/psd/          @karpushkin_AT_inr.ru
-/core/data/test/psd/     @karpushkin_AT_inr.ru
-/core/detectors/psd/     @karpushkin_AT_inr.ru
-/macro/psd/              @karpushkin_AT_inr.ru
-/sim/detectors/psd/      @karpushkin_AT_inr.ru
-/reco/detectors/psd/     @karpushkin_AT_inr.ru
+/analysis/detectors/psd/ @v.friese
+/core/data/psd/          @v.friese
+/core/data/test/psd/     @v.friese
+/core/detectors/psd/     @v.friese
+/macro/psd/              @v.friese
+/sim/detectors/psd/      @v.friese
+/reco/detectors/psd/     @v.friese
 
 # FSD
-/analysis/detectors/fsd/ @l.chlad
-/core/data/fsd/          @l.chlad
-/core/detectors/fsd/     @l.chlad
-/sim/detectors/fsd/      @l.chlad
-/reco/detectors/fsd/     @l.chlad
+/analysis/detectors/fsd/ @dvorar10_AT_fjfi.cvut.cz
+/core/data/fsd/          @dvorar10_AT_fjfi.cvut.cz
+/core/detectors/fsd/     @dvorar10_AT_fjfi.cvut.cz
+/sim/detectors/fsd/      @dvorar10_AT_fjfi.cvut.cz
+/reco/detectors/fsd/     @dvorar10_AT_fjfi.cvut.cz
 
 # MUCH
 /core/data/much/         @v.singhal