Skip to content

Commit

Permalink
Merge pull request #29817 from mmusich/fixFillMethodPayloadInspector
Browse files Browse the repository at this point in the history 
[Payload Inspector] Update derived classes to use fill() method for Histrogram1D after PR  #29622
  • Loading branch information
@cmsbuild
cmsbuild committed May 13, 2020
2 parents be6a2b8 + a6d0de9 commit a8d211a
Show file tree
Hide file tree
Showing 25 changed files with 184 additions and 124 deletions.
5 changes: 3 additions & 2 deletions CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<AlignmentErrorsExtended> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
std::vector<AlignTransformErrorExtended> alignErrors = payload->m_alignError;
Expand Down
5 changes: 3 additions & 2 deletions CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> > &iovs) override {
for (auto const &iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const &iov : tag.iovs) {
std::shared_ptr<AlignmentSurfaceDeformations> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
int i = 0;
Expand Down
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalIntercalibConstantsMC> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -115,8 +116,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalIntercalibConstantsMC> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalIntercalibConstants> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -105,8 +106,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalIntercalibConstants> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalIntercalibErrors> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -114,8 +115,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalIntercalibErrors> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalLaserAPDPNRatiosRef> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -113,8 +114,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalLaserAPDPNRatiosRef> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalLaserAPDPNRatios> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// set to -1 for ieta 0 (no crystal)
Expand Down Expand Up @@ -96,8 +97,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalLaserAPDPNRatios> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// set to -1 everywhwere
Expand Down
12 changes: 7 additions & 5 deletions CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalLaserAlphas> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -113,8 +114,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalLaserAlphas> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -352,4 +354,4 @@ PAYLOAD_INSPECTOR_MODULE(EcalLaserAlphas) {
PAYLOAD_INSPECTOR_CLASS(EcalLaserAlphasPlot);
PAYLOAD_INSPECTOR_CLASS(EcalLaserAlphasDiff);
PAYLOAD_INSPECTOR_CLASS(EcalLaserAlphasSummaryPlot);
}
}
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPFRecHitThresholds> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -113,8 +114,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPFRecHitThresholds> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down
60 changes: 36 additions & 24 deletions CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,8 +705,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -753,8 +754,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -797,8 +799,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -842,8 +845,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -893,8 +897,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -943,8 +948,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -994,8 +1000,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -1041,8 +1048,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -1084,8 +1092,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -1128,8 +1137,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -1178,8 +1188,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -1227,8 +1238,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalPedestals> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down
12 changes: 7 additions & 5 deletions CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalTimeCalibConstants> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -114,8 +115,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalTimeCalibConstants> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down Expand Up @@ -355,4 +357,4 @@ PAYLOAD_INSPECTOR_MODULE(EcalTimeCalibConstants) {
PAYLOAD_INSPECTOR_CLASS(EcalTimeCalibConstantsPlot);
PAYLOAD_INSPECTOR_CLASS(EcalTimeCalibConstantsDiff);
PAYLOAD_INSPECTOR_CLASS(EcalTimeCalibConstantsSummaryPlot);
}
}
10 changes: 6 additions & 4 deletions CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ namespace {
}

// Histogram2D::fill (virtual) needs be overridden - the implementation should use fillWithValue
bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalTimeCalibErrors> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
// looping over the EB channels, via the dense-index, mapped into EBDetId's
Expand Down Expand Up @@ -114,8 +115,9 @@ namespace {
Base::setSingleIov(true);
}

bool fill(const std::vector<std::tuple<cond::Time_t, cond::Hash> >& iovs) override {
for (auto const& iov : iovs) {
bool fill() override {
auto tag = PlotBase::getTag<0>();
for (auto const& iov : tag.iovs) {
std::shared_ptr<EcalTimeCalibErrors> payload = Base::fetchPayload(std::get<1>(iov));
if (payload.get()) {
if (payload->endcapItems().empty())
Expand Down

0 comments on commit a8d211a

Please sign in to comment.