diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h
index ffaed9dea2034f79fa1e6f128ffbb49adb36ba29..7f783422907af3800709d2afd4b45b1d6cc5c7c4 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -25,7 +25,7 @@ class TrigEFBjet_p1
  public:
   
   TrigEFBjet_p1() {}
-  virtual ~TrigEFBjet_p1(){}
+  virtual ~TrigEFBjet_p1() = default;
  
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h
index 66e06a249f1b6e617f8a4e6e4b01fef2446bac33..9eae3ec17563e39aa1b310e7b764203615e427d3 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -32,7 +32,7 @@ class TrigEFBjet_p2 {
     m_xChi2(0.0), m_xSv(0.0),
     m_xmvtx(0.0), m_xevtx(0.0), m_xnvtx(0.0)
     {}
-  virtual ~TrigEFBjet_p2(){}
+  virtual ~TrigEFBjet_p2() = default;
  
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h
index 878e64c32de783a2336779aaefab689f9bc41ff8..87e08686e500eb0b0c8a312a370fdf1706dfb77f 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -27,7 +27,7 @@ class TrigEFBphys_p1
  public:
   
   TrigEFBphys_p1() {}
-  virtual ~TrigEFBphys_p1(){}
+  virtual ~TrigEFBphys_p1() = default;
   
   enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11};
   
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h
index 648a14e80d8418cf5a95d111960b4e1d8f26eb03..0bee99eae40bce42a40f7b08afeeebc762db62c6 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -29,7 +29,7 @@ class TrigEFBphys_p2
  public:
   
   TrigEFBphys_p2() {}
-  virtual ~TrigEFBphys_p2(){}
+  virtual ~TrigEFBphys_p2() = default;
 
   enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11};
   
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h
index e65bfc83c3284e764993a95068854b05f8ba4b1d..b7ecfd5e360523784cda9e84afad27a35c360877 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -29,7 +29,7 @@ class TrigEFBphys_p3
  public:
   
   TrigEFBphys_p3() {}
-  virtual ~TrigEFBphys_p3(){}
+  virtual ~TrigEFBphys_p3() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h
index 1f3d57375ab877f193426eecec318d818cd16259..1b85c77e82d3e32961eeb193345abfa9a8f8edd6 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -28,7 +28,7 @@ class TrigElectron_p1
  public:
   
   TrigElectron_p1() {}
-  virtual ~TrigElectron_p1() {}
+  virtual ~TrigElectron_p1() = default;
   friend class TrigElectronCnv_p1;
   
   //private:
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h
index 2d811b86ffdf2e93e9f88b447376c54065c58362..1964f246afc4c56dc17afccdc7273900704ffb48 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -49,7 +49,7 @@ class TrigElectron_p2
     m_cl_e_frac_S2(-999.9),
     m_cl_e_frac_S3(-999.9)
     {}
-  virtual ~TrigElectron_p2() {}
+  virtual ~TrigElectron_p2() = default;
   friend class TrigElectronCnv_p2;
   
   //private:
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h
index cfb11912e2fcafcc32d2c8b357a56819fc4b9164..500e2c7bd09ba145911fabc7576cc5710eab8a4b 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -38,7 +38,7 @@ class TrigElectron_p3
     m_tr_nr_trt_hits(-999),
     m_tr_nr_trt_hithresh_hits(-999)
     {}
-  virtual ~TrigElectron_p3() {}
+  virtual ~TrigElectron_p3()  = default;
   friend class TrigElectronCnv_p3;
   
   //private:
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h
index 7acdec4535d62bbd94c411600460a1d5210e3ae0..0d9b9070b9c9676ae1de5b2ff30265920656a8ef 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -25,7 +25,7 @@ class TrigL2Bjet_p1
  public:
   
   TrigL2Bjet_p1() {}
-  virtual ~TrigL2Bjet_p1(){}
+  virtual ~TrigL2Bjet_p1() = default;
  
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h
index d8403114c4ee69ff500928ee94d05606d7271d17..a35d0cf3e2751cbb82da2aebc184a6c66a9cef82 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -32,7 +32,7 @@ class TrigL2Bjet_p2 {
     m_xChi2(0.0), m_xSv(0.0),  
     m_xmvtx(0.0), m_xevtx(0.0), m_xnvtx(0.0)
     {}
-  virtual ~TrigL2Bjet_p2(){}
+  virtual ~TrigL2Bjet_p2() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h
index 26ca71ea6dc881912e42dd52ad60c7f9695ecd46..445644f8fc68ed8e5925034cbeb3064dc4f5b1ce 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -29,7 +29,7 @@ class TrigL2Bjet_p3 {
   TrigL2Bjet_p3() :
     m_valid(0), m_roiID(0), m_P4PtEtaPhiM(0)
     {}
-  virtual ~TrigL2Bjet_p3(){}
+  virtual ~TrigL2Bjet_p3() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h
index b59550a8efbc76fb3c8f62458d107194753118f4..e20355976736108bfdf4b1c89bcc697b5f961b0e 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -27,7 +27,7 @@ class TrigL2Bphys_p1
  public:
   
   TrigL2Bphys_p1() {}
-  virtual ~TrigL2Bphys_p1(){}
+  virtual ~TrigL2Bphys_p1() = default;
 
   enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11};
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h
index 912fd60e4242cfb9bdb11522f931ca084491bed8..99e0e6b960081d28fa14acf39d4d6df9c415596f 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -29,7 +29,7 @@ class TrigL2Bphys_p2
  public:
   
   TrigL2Bphys_p2() {}
-  virtual ~TrigL2Bphys_p2(){}
+  virtual ~TrigL2Bphys_p2() = default;
 
   enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11};
   
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h
index e341f549c9f954fd3eda2a4d90f47629cce7ed1a..27cb790320b8b469ef5c3d40e588577ba2489af6 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -28,7 +28,7 @@ class TrigL2Bphys_p3
  public:
   
   TrigL2Bphys_p3() {}
-  virtual ~TrigL2Bphys_p3(){}
+  virtual ~TrigL2Bphys_p3() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h
index def92803c0fe82b18ad724b8ccbb3964f9229afc..28f47491d18202dff1fbe9f9e5984c4408323838 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -27,7 +27,7 @@ class TrigPhoton_p1
  public:
   
   TrigPhoton_p1() {}
-  virtual ~TrigPhoton_p1(){}
+  virtual ~TrigPhoton_p1() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h
index 6df3ff3e2174b632a672354df6f42e7a4369bafc..da196003ed260dbe0d4a832c8d83cc002ea6ebbc 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -45,7 +45,7 @@ class TrigPhoton_p2
     m_valid(false)
   {}
 
-  virtual ~TrigPhoton_p2(){}
+  virtual ~TrigPhoton_p2() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h
index 287e318132678f4523d8e9a758e6847d227fac44..15389d86eb1c5b0c030debc196e645c98faa687d 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -35,7 +35,7 @@ class TrigPhoton_p3
     m_valid(false)
   {}
 
-  virtual ~TrigPhoton_p3(){}
+  virtual ~TrigPhoton_p3() = default;
   
   //private:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h
index 3c3c52d46604bd94eb0debe3c4020269308f53f7..9ccab113973a7b927899c095d4e9b3ebc0f46849 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -40,7 +40,7 @@ class TrigTau_p3
     m_p4PtEtaPhiM()
   {};
 
-  ~TrigTau_p3() {};
+  ~TrigTau_p3() = default;
   
   //private: