diff --git a/core/qa/CbmQaTask.h b/core/qa/CbmQaTask.h
index 8e499e3e03070ea55479531f64d969645f1f8804..e7ae74d9062f6768a1b346da187a9536dcba2da6 100644
--- a/core/qa/CbmQaTask.h
+++ b/core/qa/CbmQaTask.h
@@ -7,8 +7,8 @@
 /// \author S.Zharko <s.zharko@gsi.de>
 /// \data   12.01.2023
 
-#ifndef CbmQaTask_h
-#define CbmQaTask_h 1
+
+#pragma once
 
 #include "CbmQaIO.h"
 #include "CbmQaTable.h"
@@ -64,22 +64,20 @@ class CbmQaTask : public FairTask, public CbmQaIO {
   bool IsMCUsed() const { return fbUseMC; }
 
   /// FairTask: Task initialization in the beginning of the run
-  InitStatus Init();
+  InitStatus Init() override;
 
   /// FairTask: Task reinitialization
-  InitStatus ReInit();
+  InitStatus ReInit() override;
 
   /// FairTask: Defines action of the task in the event/TS
-  void Exec(Option_t* /*option*/);
+  void Exec(Option_t* /*option*/) override;
 
   /// FairTask: Defines action of the task in the end of run
-  void Finish();
+  void Finish() override;
 
   /// @brief Sets name of the setup
   void SetSetupName(const char* setup) { fsSetupName = setup; }
 
-  ClassDef(CbmQaTask, 0);
-
   // *****************************************************
   // ** Functions accessible inside the derived classes **
   // *****************************************************
@@ -149,6 +147,8 @@ class CbmQaTask : public FairTask, public CbmQaIO {
   std::string fsSetupName = "";  ///< Name of the setup (to draw on the canvases)
 
   TParameter<int> fNofEvents{"nEvents", 0};  ///< Number of processed events
+
+  ClassDefOverride(CbmQaTask, 0);
 };
 
 
@@ -182,5 +182,3 @@ bool CbmQaTask::CheckRange(std::string_view name, T var, T varErr, T lo, T hi) c
   }
   return ret;
 }
-
-#endif  // CbmQaTask_h
diff --git a/reco/KF/CbmKfFitTracksTask.h b/reco/KF/CbmKfFitTracksTask.h
index 3f0b1e87533faf9cd5ffdf55a1d3d2f7dfc0b1a6..4b43d73529dca12cb8a854611770367591f8c375 100644
--- a/reco/KF/CbmKfFitTracksTask.h
+++ b/reco/KF/CbmKfFitTracksTask.h
@@ -7,6 +7,7 @@
 /// @date    15.11.2023
 /// @brief   Task class for refitting global or sts tracks
 
+
 #pragma once
 
 #include "CbmKfTrackFitter.h"
diff --git a/reco/L1/qa/CbmCaInputQaBase.h b/reco/L1/qa/CbmCaInputQaBase.h
index 01def8756c36ccfa1a6714a178a6fc44ad0de428..5f71e64dc29c1f478a9ceb6e9e5758a44e1de654 100644
--- a/reco/L1/qa/CbmCaInputQaBase.h
+++ b/reco/L1/qa/CbmCaInputQaBase.h
@@ -7,8 +7,8 @@
 /// @brief  Class providing basic functionality for CA input QA-tasks
 /// @author S.Zharko <s.zharko@gsi.de>
 
-#ifndef CbmCaInputQaBase_h
-#define CbmCaInputQaBase_h 1
+
+#pragma once
 
 #include "CbmCaHitQaData.h"
 #include "CbmCaInputQaBase.h"
@@ -100,19 +100,19 @@ class CbmCaInputQaBase : public CbmQaTask {
 
   /// \brief  Method to check, if the QA results are acceptable
   /// \return Map of checks: key - name of the check, value - result of the check
-  std::map<std::string, bool> Check();
+  std::map<std::string, bool> Check() override;
 
   /// @brief Initializes data branches
-  InitStatus InitDataBranches();
+  InitStatus InitDataBranches() override;
 
   /// @brief Initializes canvases
-  InitStatus InitCanvases();
+  InitStatus InitCanvases() override;
 
   /// @brief Initializes histograms
-  InitStatus InitHistograms();
+  InitStatus InitHistograms() override;
 
   /// @brief Fills histograms per event or time-slice
-  void FillHistograms();
+  void FillHistograms() override;
 
   /// @brief Fills histograms per hit
   virtual void FillHistogramsPerHit() {}
@@ -121,7 +121,7 @@ class CbmCaInputQaBase : public CbmQaTask {
   virtual void FillHistogramsPerPoint() {}
 
   /// @brief De-initializes histograms
-  void DeInit();
+  void DeInit() override;
 
   /// @brief Defines parameter for a derived class
   virtual void DefineParameters() = 0;
@@ -288,5 +288,3 @@ class CbmCaInputQaBase : public CbmQaTask {
  protected:
   cbm::ca::HitQaData fHitQaData{};  ///< Current hit QA data object
 };
-
-#endif  // CbmCaInputQaBase_h
diff --git a/reco/L1/qa/CbmCaInputQaMuch.h b/reco/L1/qa/CbmCaInputQaMuch.h
index 48a3cfde760d6b1ed01a1dd51c02c3e4bebf9458..414001d5a71a83ccdc6197eba7a850e8c7687f8d 100644
--- a/reco/L1/qa/CbmCaInputQaMuch.h
+++ b/reco/L1/qa/CbmCaInputQaMuch.h
@@ -8,8 +8,7 @@
 /// \author S.Zharko <s.zharko@gsi.de>
 
 
-#ifndef CbmCaInputQaMuch_h
-#define CbmCaInputQaMuch_h 1
+#pragma once
 
 #include "CbmCaInputQaBase.h"
 
@@ -25,34 +24,32 @@ class CbmCaInputQaMuch : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kMu
  protected:
   /// \brief  Method to check, if the QA results are acceptable
   /// \return Map of checks: key - name of the check, value - result of the check
-  std::map<std::string, bool> Check() { return CbmCaInputQaBase::Check(); }
+  std::map<std::string, bool> Check() override { return CbmCaInputQaBase::Check(); }
 
   /// @brief Initializes data branches
-  InitStatus InitDataBranches();
+  InitStatus InitDataBranches() override;
 
   /// @brief Initializes canvases
-  InitStatus InitCanvases();
+  InitStatus InitCanvases() override;
 
   /// @brief Initializes histograms
-  InitStatus InitHistograms();
+  InitStatus InitHistograms() override;
 
   /// @brief Fills histograms per event or time-slice
-  void FillHistograms() { CbmCaInputQaBase::FillHistograms(); }
+  void FillHistograms() override { CbmCaInputQaBase::FillHistograms(); }
 
   /// @brief De-initializes histograms
-  void DeInit();
+  void DeInit() override;
 
   /// @brief Defines parameters of the task
-  void DefineParameters();
+  void DefineParameters() override;
 
   /// @brief Fills histograms per hit
-  void FillHistogramsPerHit();
+  void FillHistogramsPerHit() override;
 
   /// @brief Fills histograms per MC point
-  void FillHistogramsPerPoint() {}
+  void FillHistogramsPerPoint() override {}
 
  private:
-  ClassDef(CbmCaInputQaMuch, 0);
+  ClassDefOverride(CbmCaInputQaMuch, 0);
 };
-
-#endif  // CbmCaInputQaMuch_h
diff --git a/reco/L1/qa/CbmCaInputQaMvd.h b/reco/L1/qa/CbmCaInputQaMvd.h
index 7e5079899a712e7df8961415e49296423f7e2ae0..6748e11c1fb05dcec158f7020a65742905362eef 100644
--- a/reco/L1/qa/CbmCaInputQaMvd.h
+++ b/reco/L1/qa/CbmCaInputQaMvd.h
@@ -8,8 +8,7 @@
 /// \author S.Zharko <s.zharko@gsi.de>
 
 
-#ifndef CbmCaInputQaMvd_h
-#define CbmCaInputQaMvd_h 1
+#pragma once
 
 #include "CbmCaInputQaBase.h"
 
@@ -25,34 +24,32 @@ class CbmCaInputQaMvd : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kMvd
  protected:
   /// \brief  Method to check, if the QA results are acceptable
   /// \return Map of checks: key - name of the check, value - result of the check
-  std::map<std::string, bool> Check() { return CbmCaInputQaBase::Check(); }
+  std::map<std::string, bool> Check() override { return CbmCaInputQaBase::Check(); }
 
   /// @brief Initializes data branches
-  InitStatus InitDataBranches();
+  InitStatus InitDataBranches() override;
 
   /// @brief Initializes canvases
-  InitStatus InitCanvases();
+  InitStatus InitCanvases() override;
 
   /// @brief Initializes histograms
-  InitStatus InitHistograms();
+  InitStatus InitHistograms() override;
 
   /// @brief Fills histograms per event or time-slice
-  void FillHistograms() { CbmCaInputQaBase::FillHistograms(); }
+  void FillHistograms() override { CbmCaInputQaBase::FillHistograms(); }
 
   /// @brief De-initializes histograms
-  void DeInit();
+  void DeInit() override;
 
   /// @brief Defines parameters of the task
-  void DefineParameters();
+  void DefineParameters() override;
 
   /// @brief Fills histograms per hit
-  void FillHistogramsPerHit();
+  void FillHistogramsPerHit() override;
 
   /// @brief Fills histograms per MC point
-  void FillHistogramsPerPoint() {}
+  void FillHistogramsPerPoint() override {}
 
  private:
-  ClassDef(CbmCaInputQaMvd, 0);
+  ClassDefOverride(CbmCaInputQaMvd, 0);
 };
-
-#endif  // CbmCaInputQaMvd_h
diff --git a/reco/L1/qa/CbmCaInputQaSetup.h b/reco/L1/qa/CbmCaInputQaSetup.h
index 587c90c7fc1ebfbaef09c6fdee72a85af35db73c..fa484fe22084c17282d79693ccc3a4f7de509dbe 100644
--- a/reco/L1/qa/CbmCaInputQaSetup.h
+++ b/reco/L1/qa/CbmCaInputQaSetup.h
@@ -7,8 +7,8 @@
 /// @since  28.08.2023
 /// @author S.Zharko <s.zharko@gsi.de>
 
-#ifndef CbmCaInputQaSetup_h
-#define CbmCaInputQaSetup_h 1
+
+#pragma once
 
 #include "CaParameters.h"
 #include "CbmL1DetectorID.h"
@@ -53,22 +53,22 @@ namespace cbm::ca
     void SetDetectorFlag(ca::EDetectorID detID, bool flag = true) { fvbUseDet[detID] = flag; }
 
     /// @brief Checks results of the QA and returns a success flag
-    std::map<std::string, bool> Check();
+    std::map<std::string, bool> Check() override;
 
     /// @brief Initializes canvases
-    InitStatus InitCanvases();
+    InitStatus InitCanvases() override;
 
     /// @brief Initializes data branches
-    InitStatus InitDataBranches();
+    InitStatus InitDataBranches() override;
 
     /// @brief Initializes histograms
-    InitStatus InitHistograms();
+    InitStatus InitHistograms() override;
 
     /// @brief Initializes time slice
-    InitStatus InitTimeSlice() { return kSUCCESS; }
+    InitStatus InitTimeSlice() override { return kSUCCESS; }
 
     /// @brief Fills histograms
-    void FillHistograms();
+    void FillHistograms() override;
 
    private:
     /// @brief Checks branches initialization
@@ -163,5 +163,3 @@ namespace cbm::ca
     }  // iH
   }
 }  // namespace cbm::ca
-
-#endif  // CbmCaInputQaSetup_h
diff --git a/reco/L1/qa/CbmCaInputQaSts.h b/reco/L1/qa/CbmCaInputQaSts.h
index 271d459f6c8f1d138b1889dca6f90d2bf2a2594e..36e3478fbd580bef1e3ea455a4ed39190da7db79 100644
--- a/reco/L1/qa/CbmCaInputQaSts.h
+++ b/reco/L1/qa/CbmCaInputQaSts.h
@@ -8,8 +8,7 @@
 /// \author S.Zharko <s.zharko@gsi.de>
 
 
-#ifndef CbmCaInputQaSts_h
-#define CbmCaInputQaSts_h 1
+#pragma once
 
 #include "CbmCaInputQaBase.h"
 #include "CbmMCDataManager.h"
@@ -46,31 +45,31 @@ class CbmCaInputQaSts : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kSts
  protected:
   /// \brief  Method to check, if the QA results are acceptable
   /// \return Map of checks: key - name of the check, value - result of the check
-  std::map<std::string, bool> Check();
+  std::map<std::string, bool> Check() override;
 
   /// Initializes data branches
-  InitStatus InitDataBranches();
+  InitStatus InitDataBranches() override;
 
   /// Initializes canvases
-  InitStatus InitCanvases();
+  InitStatus InitCanvases() override;
 
   /// Initializes histograms
-  InitStatus InitHistograms();
+  InitStatus InitHistograms() override;
 
   /// Fills histograms per event or time-slice
-  void FillHistograms() { CbmCaInputQaBase::FillHistograms(); }
+  void FillHistograms() override { CbmCaInputQaBase::FillHistograms(); }
 
   /// De-initializes histograms
-  void DeInit();
+  void DeInit() override;
 
   /// @brief Defines parameters of the task
-  void DefineParameters();
+  void DefineParameters() override;
 
   /// @brief Fills histograms per hit
-  void FillHistogramsPerHit();
+  void FillHistogramsPerHit() override;
 
   /// @brief Fills histograms per MC point
-  void FillHistogramsPerPoint();
+  void FillHistogramsPerPoint() override;
 
  private:
   // ----- Data branches
@@ -84,7 +83,5 @@ class CbmCaInputQaSts : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kSts
   std::vector<TH1F*> fvph_pull_u_Ndig;  ///< pull for u coordinate, depending on N digis in the cluster
   std::vector<TH1F*> fvph_pull_v_Ndig;  ///< pull for v coordinate, depending on N digis in the cluster
 
-  ClassDef(CbmCaInputQaSts, 0);
+  ClassDefOverride(CbmCaInputQaSts, 0);
 };
-
-#endif  // CbmCaInputQaSts_h
diff --git a/reco/L1/qa/CbmCaInputQaTof.h b/reco/L1/qa/CbmCaInputQaTof.h
index 4f3b5872c0010e89512c02103d3986179d7d9b68..96357c8063e5139dfcd2e61866d510e08bf85311 100644
--- a/reco/L1/qa/CbmCaInputQaTof.h
+++ b/reco/L1/qa/CbmCaInputQaTof.h
@@ -8,8 +8,7 @@
 /// \author S.Zharko <s.zharko@gsi.de>
 
 
-#ifndef CbmCaInputQaTof_h
-#define CbmCaInputQaTof_h 1
+#pragma once
 
 #include "CbmCaInputQaBase.h"
 #include "CbmMCDataManager.h"
@@ -51,31 +50,31 @@ class CbmCaInputQaTof : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kTof
  protected:
   /// \brief  Method to check, if the QA results are acceptable
   /// \return Map of checks: key - name of the check, value - result of the check
-  std::map<std::string, bool> Check() { return CbmCaInputQaBase::Check(); }
+  std::map<std::string, bool> Check() override { return CbmCaInputQaBase::Check(); }
 
   /// @brief Initializes data branches
-  InitStatus InitDataBranches();
+  InitStatus InitDataBranches() override;
 
   /// @brief Initializes canvases
-  InitStatus InitCanvases();
+  InitStatus InitCanvases() override;
 
   /// @brief Initializes histograms
-  InitStatus InitHistograms();
+  InitStatus InitHistograms() override;
 
   /// @brief Fills histograms per event or time-slice
-  void FillHistograms();
+  void FillHistograms() override;
 
   /// @brief De-initializes histograms
-  void DeInit();
+  void DeInit() override;
 
   /// @brief Defines parameters of the task
-  void DefineParameters();
+  void DefineParameters() override;
 
   /// @brief Fills histograms per hit
-  void FillHistogramsPerHit();
+  void FillHistogramsPerHit() override;
 
   /// @brief Fills histograms per MC point
-  void FillHistogramsPerPoint() {}
+  void FillHistogramsPerPoint() override {}
 
  private:
   /// @brief Fills channel info map
@@ -96,7 +95,5 @@ class CbmCaInputQaTof : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kTof
   Vector3D_t<TH2F*> fvph_hit_zx_vs_cell;  ///< Hit occupancy vs. TOF cell in ZX-plane
   Vector3D_t<TH2F*> fvph_hit_zy_vs_cell;  ///< Hit occupancy vs. TOF cell in ZY-plane
 
-  ClassDef(CbmCaInputQaTof, 0);
+  ClassDefOverride(CbmCaInputQaTof, 0);
 };
-
-#endif  // CbmCaInputQaTof_h
diff --git a/reco/L1/qa/CbmCaInputQaTrd.h b/reco/L1/qa/CbmCaInputQaTrd.h
index 419a6ad5d1dedb4b227acfbf9d48fa851b985c35..db103ee5d821571baf01c86074596921df7bb91b 100644
--- a/reco/L1/qa/CbmCaInputQaTrd.h
+++ b/reco/L1/qa/CbmCaInputQaTrd.h
@@ -8,8 +8,7 @@
 /// \author S.Zharko <s.zharko@gsi.de>
 
 
-#ifndef CbmCaInputQaTrd_h
-#define CbmCaInputQaTrd_h 1
+#pragma once
 
 #include "CbmCaInputQaBase.h"
 
@@ -25,34 +24,32 @@ class CbmCaInputQaTrd : public CbmCaInputQaBase<cbm::algo::ca::EDetectorID::kTrd
  protected:
   /// \brief  Method to check, if the QA results are acceptable
   /// \return Map of checks: key - name of the check, value - result of the check
-  std::map<std::string, bool> Check() { return CbmCaInputQaBase::Check(); }
+  std::map<std::string, bool> Check() override { return CbmCaInputQaBase::Check(); }
 
   /// @brief Initializes data branches
-  InitStatus InitDataBranches();
+  InitStatus InitDataBranches() override;
 
   /// @brief Initializes canvases
-  InitStatus InitCanvases();
+  InitStatus InitCanvases() override;
 
   /// @brief Initializes histograms
-  InitStatus InitHistograms();
+  InitStatus InitHistograms() override;
 
   /// @brief Fills histograms per event or time-slice
-  void FillHistograms() { CbmCaInputQaBase::FillHistograms(); }
+  void FillHistograms() override { CbmCaInputQaBase::FillHistograms(); }
 
   /// @brief De-initializes histograms
-  void DeInit();
+  void DeInit() override;
 
   /// @brief Defines parameters of the task
-  void DefineParameters();
+  void DefineParameters() override;
 
   /// @brief Fills histograms per hit
-  void FillHistogramsPerHit();
+  void FillHistogramsPerHit() override;
 
   /// @brief Fills histograms per MC point
-  void FillHistogramsPerPoint() {}
+  void FillHistogramsPerPoint() override {}
 
  private:
-  ClassDef(CbmCaInputQaTrd, 0);
+  ClassDefOverride(CbmCaInputQaTrd, 0);
 };
-
-#endif  // CbmCaInputQaTrd_h
diff --git a/reco/L1/qa/CbmCaOutputQa.h b/reco/L1/qa/CbmCaOutputQa.h
index 46b2f3e7c069f1191defc6478a2d66ee5be4b8dc..9a90689d9d058e6eb87b0b509014101b5ee71fdb 100644
--- a/reco/L1/qa/CbmCaOutputQa.h
+++ b/reco/L1/qa/CbmCaOutputQa.h
@@ -7,8 +7,8 @@
 /// @since  24.02.2023
 /// @author Sergei Zharko <s.zharko@gsi.de>
 
-#ifndef CbmCaOutputQa_h
-#define CbmCaOutputQa_h 1
+
+#pragma once
 
 #include "CaMonitor.h"
 #include "CaParameters.h"
@@ -191,32 +191,29 @@ namespace cbm::ca
       fmSummaryTableEntries = std::move(trackTypes);
     }
 
-
-    ClassDef(OutputQa, 0);
-
    protected:
     /// \brief  Method to check, if the QA results are acceptable
     /// \return Map of checks: key - name of the check, value - result of the check
-    std::map<std::string, bool> Check();
+    std::map<std::string, bool> Check() override;
 
     /// @brief Initializes canvases
-    InitStatus InitCanvases();
+    InitStatus InitCanvases() override;
 
     /// @brief Initialises data branches in the beginning of the run
-    InitStatus InitDataBranches();
+    InitStatus InitDataBranches() override;
 
     /// @brief Initializes histograms
-    InitStatus InitHistograms();
+    InitStatus InitHistograms() override;
 
     /// @brief Initializes time slice
     /// @note  Is called in the FairTask::Exec function
-    InitStatus InitTimeSlice();
+    InitStatus InitTimeSlice() override;
 
     /// @brief Fills histograms from time slice or event
-    void FillHistograms();
+    void FillHistograms() override;
 
     /// @brief De-initializes histograms
-    void DeInit() {}
+    void DeInit() override {}
 
     /// @brief Fills histograms for a given track types
     /// @param type  Track type
@@ -307,7 +304,10 @@ namespace cbm::ca
 
     static constexpr int kCXSIZEPX = 600;  ///< Canvas size along x-axis [px]
     static constexpr int kCYSIZEPX = 600;  ///< Canvas size along y-axis [px]
+
+    ClassDefOverride(OutputQa, 0);
   };
+
 }  // namespace cbm::ca
 
 
@@ -346,5 +346,3 @@ void cbm::ca::OutputQa::DrawSetOf(const std::vector<ETrackType>& vTypes, std::fu
     fvpTrackHistograms[type]->FillMCTrack(iTrkMC);
   }
 }
-
-#endif  // CbmCaOutputQa_h
diff --git a/reco/L1/qa/CbmCaTrackFitQa.h b/reco/L1/qa/CbmCaTrackFitQa.h
index 46db6aee939a054409dbefa4813f1b8182879d95..0ce34ddd9b01c34033ccf7cf1217d17a8b616419 100644
--- a/reco/L1/qa/CbmCaTrackFitQa.h
+++ b/reco/L1/qa/CbmCaTrackFitQa.h
@@ -7,8 +7,8 @@
 /// @since  03.04.2023
 /// @author Sergei Zharko <s.zharko@gsi.de>
 
-#ifndef CbmCaTrackFitQa_h
-#define CbmCaTrackFitQa_h 1
+
+#pragma once
 
 #include "CaConstants.h"
 #include "CaEnumArray.h"
@@ -199,6 +199,8 @@ namespace cbm::ca
     TString fsTitle = "";  ///< Title of the point
 
     double fMass = constants::phys::MuonMass;  /// Mass of particle
+
+    ClassDefNV(TrackFitQa, 0);
   };
 
   // *****************************
@@ -218,6 +220,3 @@ namespace cbm::ca
     fvphPulls[type]->Fill(pull);
   }
 }  // namespace cbm::ca
-
-
-#endif  // CbmCaTrackFitQa_h
diff --git a/reco/L1/qa/CbmCaTrackTypeQa.h b/reco/L1/qa/CbmCaTrackTypeQa.h
index 63ab870652b4a635db951e172b22cd4b49aa95c8..82c34998ffcdf3872cebcd984abd29790425dd28 100644
--- a/reco/L1/qa/CbmCaTrackTypeQa.h
+++ b/reco/L1/qa/CbmCaTrackTypeQa.h
@@ -7,8 +7,8 @@
 /// @since  27.03.2023
 /// @author Sergei Zharko <s.zharko@gsi.de>
 
-#ifndef CbmCaTrackTypeQa_h
-#define CbmCaTrackTypeQa_h 1
+
+#pragma once
 
 #include "CaField.h"
 #include "CaParameters.h"
@@ -346,7 +346,8 @@ namespace cbm::ca
     Style_t fMarkerStyle = 20;  ///< Marker style
     Color_t fLineColor   = 1;   ///< Line color
     Style_t fLineStyle   = 1;   ///< Line style
+
+    ClassDefNV(TrackTypeQa, 0);
   };
-}  // namespace cbm::ca
 
-#endif  // CbmCaOutput
+}  // namespace cbm::ca
diff --git a/reco/L1/qa/CbmTrackerInputQaTof.h b/reco/L1/qa/CbmTrackerInputQaTof.h
index 18b4cd213b9f4a40f91ff094e04d49a34a7ec96b..c6d18aae529badea2ebfe59a0e78d1935869e069 100644
--- a/reco/L1/qa/CbmTrackerInputQaTof.h
+++ b/reco/L1/qa/CbmTrackerInputQaTof.h
@@ -6,8 +6,8 @@
 /// @author Sergey Gorbunov
 /// @date 02.11.2021
 
-#ifndef CbmTrackerInputQaTof_H
-#define CbmTrackerInputQaTof_H
+
+#pragma once
 
 #include "CbmQaCanvas.h"
 #include "CbmQaHist.h"
@@ -50,22 +50,22 @@ class CbmTrackerInputQaTof : public FairTask {
   ~CbmTrackerInputQaTof();
 
   /// FairTask: Intialisation at begin of run.
-  InitStatus Init() { return ReInit(); }
+  InitStatus Init() override { return ReInit(); }
 
   /// FairTask: Reinitialisation.
-  InitStatus ReInit();
+  InitStatus ReInit() override;
 
   /// FairTask:  Intialise parameter containers.
-  void SetParContainers();
+  void SetParContainers() override;
 
   /// FairTask: Action at end of run. For this task and all of the subtasks.
-  void Finish();
+  void Finish() override;
 
   /// TTask: Clear all data structures created by a previous execution of a task.
-  void Clear(Option_t* /*option*/ = "") {}
+  void Clear(Option_t* /*option*/ = "") override {}
 
   /// TTask: Process a timeslice
-  void Exec(Option_t*);
+  void Exec(Option_t*) override;
 
   /// Prepare the Qa output and return it as a reference to an internal TFolder.
   /// The reference is non-const, because FairSink can not write const objects
@@ -158,7 +158,5 @@ class CbmTrackerInputQaTof : public FairTask {
   /// Suppressed assignment operator
   CbmTrackerInputQaTof& operator=(const CbmTrackerInputQaTof&) = delete;
 
-  ClassDef(CbmTrackerInputQaTof, 0);
+  ClassDefOverride(CbmTrackerInputQaTof, 0);
 };
-
-#endif
diff --git a/reco/L1/qa/CbmTrackerInputQaTrd.h b/reco/L1/qa/CbmTrackerInputQaTrd.h
index bbf6940150571db8ec2c29a2fbc8230396623bdb..14fcb7f7248fc98f0f39e37a00d06d80ddcdf342 100644
--- a/reco/L1/qa/CbmTrackerInputQaTrd.h
+++ b/reco/L1/qa/CbmTrackerInputQaTrd.h
@@ -6,8 +6,8 @@
 /// @author Sergey Gorbunov
 /// @date 02.11.2021
 
-#ifndef CbmTrackerInputQaTrd_H
-#define CbmTrackerInputQaTrd_H
+
+#pragma once
 
 #include "CbmQaCanvas.h"
 #include "CbmQaHist.h"
@@ -50,22 +50,22 @@ class CbmTrackerInputQaTrd : public FairTask {
   ~CbmTrackerInputQaTrd();
 
   /// FairTask: Intialisation at begin of run.
-  InitStatus Init() { return ReInit(); }
+  InitStatus Init() override { return ReInit(); }
 
   /// FairTask: Reinitialisation.
-  InitStatus ReInit();
+  InitStatus ReInit() override;
 
   /// FairTask:  Intialise parameter containers.
-  void SetParContainers();
+  void SetParContainers() override;
 
   /// FairTask: Action at end of run. For this task and all of the subtasks.
-  void Finish();
+  void Finish() override;
 
   /// TTask: Clear all data structures created by a previous execution of a task.
-  void Clear(Option_t* /*option*/ = "") {}
+  void Clear(Option_t* /*option*/ = "") override {}
 
   /// TTask: Process a timeslice
-  void Exec(Option_t*);
+  void Exec(Option_t*) override;
 
   /// Prepare the Qa output and return it as a reference to an internal TFolder.
   /// The reference is non-const, because FairSink can not write const objects
@@ -160,7 +160,5 @@ class CbmTrackerInputQaTrd : public FairTask {
   /// Suppressed assignment operator
   CbmTrackerInputQaTrd& operator=(const CbmTrackerInputQaTrd&) = delete;
 
-  ClassDef(CbmTrackerInputQaTrd, 0);
+  ClassDefOverride(CbmTrackerInputQaTrd, 0);
 };
-
-#endif