From 65d2302f0b2080178bd87dd43b513644f65c6a14 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Fri, 3 Sep 2021 17:56:30 +0200
Subject: [PATCH 1/2] [GCC11] Fix compilation warning for EcalMatacqDigi

---
 DataFormats/EcalDigi/interface/EcalMatacqDigi.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/DataFormats/EcalDigi/interface/EcalMatacqDigi.h b/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
index b7cbc3949cf01..6233c8e807b11 100644
--- a/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
+++ b/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
@@ -29,7 +29,7 @@ class EcalMatacqDigi {
 public:
   /** Default constructor.
    */
-  EcalMatacqDigi() : chId_(-1), ts_(0.), tTrigS_(999.), version_(-1) { init(); }
+  EcalMatacqDigi() : chId_(-1), freq(0), ts_(0.), tTrigS_(999.), version_(-1) { init(); }
 
   /** Constructor
    * @param samples adc time samples
@@ -43,7 +43,7 @@ class EcalMatacqDigi {
                  const double& ts,
                  const short& version = -1,
                  const double& tTrig = 999.)
-      : chId_(chId), data_(samples), ts_(ts), tTrigS_(tTrig), version_(version) {
+      : chId_(chId), data_(samples), freq(0), ts_(ts), tTrigS_(tTrig), version_(version) {
     init();
   };
 
@@ -270,6 +270,7 @@ class EcalMatacqDigi {
    * @param value new value
    */
   void laserPower(int value) { laserPower_ = value; }
+#endif
 
   void init() {
 #if (ECAL_MATACQ_DIGI_VERS >= 2)
@@ -285,11 +286,11 @@ class EcalMatacqDigi {
     emtcPhase_ = -1;
     attenuation_dB_ = -1;
     laserPower_ = -1;
+    tv_sec_ = 0;
+    tv_usec_ = 0;
 #endif
   }
 
-#endif
-
 private:
   /** Electronic channel id
    */

From 9712294b6e8ea0912a6db541c56481e2fbc1164a Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Mon, 6 Sep 2021 13:54:59 +0200
Subject: [PATCH 2/2] remove unused data member EcalMatacqDigi::freq

---
 DataFormats/EcalDigi/interface/EcalMatacqDigi.h | 8 ++------
 DataFormats/EcalDigi/src/classes_def.xml        | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/DataFormats/EcalDigi/interface/EcalMatacqDigi.h b/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
index 6233c8e807b11..f33815d7b73d5 100644
--- a/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
+++ b/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
@@ -29,7 +29,7 @@ class EcalMatacqDigi {
 public:
   /** Default constructor.
    */
-  EcalMatacqDigi() : chId_(-1), freq(0), ts_(0.), tTrigS_(999.), version_(-1) { init(); }
+  EcalMatacqDigi() : chId_(-1), ts_(0.), tTrigS_(999.), version_(-1) { init(); }
 
   /** Constructor
    * @param samples adc time samples
@@ -43,7 +43,7 @@ class EcalMatacqDigi {
                  const double& ts,
                  const short& version = -1,
                  const double& tTrig = 999.)
-      : chId_(chId), data_(samples), freq(0), ts_(ts), tTrigS_(tTrig), version_(version) {
+      : chId_(chId), data_(samples), ts_(ts), tTrigS_(tTrig), version_(version) {
     init();
   };
 
@@ -300,10 +300,6 @@ class EcalMatacqDigi {
    */
   std::vector<Short_t> data_;
 
-  /** Frequency mode. 1->1GHz sampling, 2->2GHz sampling
-   */
-  int freq;
-
   /**Sampling period in seconds. In priniciple 1ns or 0.5ns
    */
   double ts_;
diff --git a/DataFormats/EcalDigi/src/classes_def.xml b/DataFormats/EcalDigi/src/classes_def.xml
index 9c40edacab4db..5f365f96523b4 100644
--- a/DataFormats/EcalDigi/src/classes_def.xml
+++ b/DataFormats/EcalDigi/src/classes_def.xml
@@ -48,7 +48,8 @@
    <class name="EcalPnDiodeDigi" ClassVersion="10">
     <version ClassVersion="10" checksum="3691846555"/>
    </class>
-   <class name="EcalMatacqDigi" ClassVersion="11">
+   <class name="EcalMatacqDigi" ClassVersion="12">
+    <version ClassVersion="12" checksum="1211538371"/>
     <version ClassVersion="11" checksum="515819338"/>
     <version ClassVersion="10" checksum="804498184"/>
    </class>