Merge pull request #35148 from smuzaffar/gcc11-warn-EcalDigi

[GCC11] Fix compilation warning for EcalMatacqDigi
cms-sw · Sep 6, 2021 · f2d6c16 · f2d6c16
2 parents 311e964 + 9712294
commit f2d6c16
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/DataFormats/EcalDigi/interface/EcalMatacqDigi.h b/DataFormats/EcalDigi/interface/EcalMatacqDigi.h
@@ -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
    */
@@ -299,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
@@ -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>