Skip to content

[GENERATORS] [DEVEL] Fix warnings on deprecated copy-constructors #43405

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

Merged
cmsbuild merged 3 commits into from
Dec 18, 2023
Merged

[GENERATORS] [DEVEL] Fix warnings on deprecated copy-constructors #43405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dacd69
[GENERATORS] [DEVEL] Fix warnings on deprecated copy-constructors
smuzaffar Nov 27, 2023
924ab10
apply code format
smuzaffar Nov 27, 2023
802b299
Revert auto_ptr change for root dict
smuzaffar Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion SimDataFormats/GeneratorProducts/interface/GenFilterInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class GenFilterInfo {
GenFilterInfo();
GenFilterInfo(unsigned int, unsigned int); // obsolete, should be avoided for new classes
GenFilterInfo(unsigned int, unsigned int, unsigned int, unsigned int, double, double, double, double);
GenFilterInfo(const GenFilterInfo&);
virtual ~GenFilterInfo();

// getters
Expand Down
3 changes: 0 additions & 3 deletions SimDataFormats/GeneratorProducts/interface/GenLumiInfoProduct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class GenLumiInfoProduct {
// constructors, destructors
GenLumiInfoProduct();
GenLumiInfoProduct(const int id);
GenLumiInfoProduct(const GenLumiInfoProduct &other);
virtual ~GenLumiInfoProduct();

// getters
Expand All @@ -35,7 +34,6 @@ class GenLumiInfoProduct {
public:
XSec() : value_(-1.), error_(-1.) {}
XSec(double v, double e = -1.) : value_(v), error_(e) {}
XSec(const XSec &other) : value_(other.value_), error_(other.error_) {}

double value() const { return value_; }
double error() const { return error_; }
Expand All @@ -57,7 +55,6 @@ class GenLumiInfoProduct {
public:
FinalStat() : n_(0), sum_(0.0), sum2_(0.0) {}
FinalStat(unsigned int n1, double sum1, double sum21) : n_(n1), sum_(sum1), sum2_(sum21) {}
FinalStat(const FinalStat &other) : n_(other.n_), sum_(other.sum_), sum2_(other.sum2_) {}

unsigned int n() const { return n_; }
double sum() const { return sum_; }
Expand Down
2 changes: 0 additions & 2 deletions SimDataFormats/GeneratorProducts/interface/GenRunInfoProduct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class GenRunInfoProduct {

// constructors, destructors
GenRunInfoProduct();
GenRunInfoProduct(const GenRunInfoProduct &other);

// getters

Expand All @@ -33,7 +32,6 @@ class GenRunInfoProduct {
public:
XSec() : value_(-1.), error_(-1.) {}
XSec(double value, double error = -1.) : value_(value), error_(error) {}
XSec(const XSec &other) : value_(other.value_), error_(other.error_) {}

double value() const { return value_; }
double error() const { return error_; }
Expand Down
10 changes: 0 additions & 10 deletions SimDataFormats/GeneratorProducts/src/GenFilterInfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ GenFilterInfo::GenFilterInfo(unsigned int passp,
sumTotalWeights_(totalw),
sumTotalWeights2_(totalw2) {}

GenFilterInfo::GenFilterInfo(const GenFilterInfo& other)
: numPassPositiveEvents_(other.numPassPositiveEvents_),
numPassNegativeEvents_(other.numPassNegativeEvents_),
numTotalPositiveEvents_(other.numTotalPositiveEvents_),
numTotalNegativeEvents_(other.numTotalNegativeEvents_),
sumPassWeights_(other.sumPassWeights_),
sumPassWeights2_(other.sumPassWeights2_),
sumTotalWeights_(other.sumTotalWeights_),
sumTotalWeights2_(other.sumTotalWeights2_) {}

GenFilterInfo::~GenFilterInfo() {}

bool GenFilterInfo::mergeProduct(GenFilterInfo const& other) {
Expand Down
3 changes: 0 additions & 3 deletions SimDataFormats/GeneratorProducts/src/GenLumiInfoProduct.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ GenLumiInfoProduct::GenLumiInfoProduct() : hepidwtup_(-1) { internalProcesses_.c

GenLumiInfoProduct::GenLumiInfoProduct(const int id) : hepidwtup_(id) { internalProcesses_.clear(); }

GenLumiInfoProduct::GenLumiInfoProduct(GenLumiInfoProduct const& other)
: hepidwtup_(other.hepidwtup_), internalProcesses_(other.internalProcesses_) {}

GenLumiInfoProduct::~GenLumiInfoProduct() {}

bool GenLumiInfoProduct::mergeProduct(GenLumiInfoProduct const& other) {
Expand Down
6 changes: 0 additions & 6 deletions SimDataFormats/GeneratorProducts/src/GenRunInfoProduct.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ using namespace std;

GenRunInfoProduct::GenRunInfoProduct() : externalFilterEfficiency_(-1.) {}

GenRunInfoProduct::GenRunInfoProduct(GenRunInfoProduct const &other)
: internalXSec_(other.internalXSec_),
externalXSecLO_(other.externalXSecLO_),
externalXSecNLO_(other.externalXSecNLO_),
externalFilterEfficiency_(other.externalFilterEfficiency_) {}

bool GenRunInfoProduct::isProductEqual(GenRunInfoProduct const &other) const {
bool result = externalXSecLO_ == other.externalXSecLO_ && externalXSecNLO_ == other.externalXSecNLO_ &&
externalFilterEfficiency_ == other.externalFilterEfficiency_;
Expand Down