Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GCC11] Fix compilation warning for EcalMatacqDigi #35148

Merged
merged 2 commits into from
Sep 6, 2021
Merged

[GCC11] Fix compilation warning for EcalMatacqDigi #35148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d2302
[GCC11] Fix compilation warning for EcalMatacqDigi
smuzaffar Sep 3, 2021
9712294
remove unused data member EcalMatacqDigi::freq
smuzaffar Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions DataFormats/EcalDigi/interface/EcalMatacqDigi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
*/
Expand All @@ -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_;
Expand Down
3 changes: 2 additions & 1 deletion DataFormats/EcalDigi/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down