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

HcalDQM: Add protection to collection non-exist case for GPUTask #40117

Merged
merged 5 commits into from Dec 2, 2022
Merged

HcalDQM: Add protection to collection non-exist case for GPUTask #40117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9de84f
fix HcalGPU Task collection name and add protection to collection non…
lwang046 Nov 19, 2022
fed5388
simplifying code from suggestion, tested works well
lwang046 Nov 20, 2022
22513e4
remove std::endl
lwang046 Nov 20, 2022
a1d3341
There is no use to fill negative values to log scaled axes, just do n…
lwang046 Nov 25, 2022
6d3e945
logic fix
lwang046 Nov 25, 2022
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
8 changes: 4 additions & 4 deletions DQM/HcalCommon/interface/ValueQuantity.h
View file
Open in desktop
Expand Up @@ -202,8 +202,8 @@ namespace hcaldqm {
{fADC_256_4, -0.5},
{fEtlog2, 0.},
{fDiffRatio, -2.5},
{fCPUenergy, 0},
{fGPUenergy, 0},
{fCPUenergy, -1},
{fGPUenergy, -1},
};
const std::map<ValueQuantityType, double> max_value = {
{fN, 1000},
Expand Down Expand Up @@ -333,8 +333,8 @@ namespace hcaldqm {
{fADC_256_4, 64},
{fEtlog2, 9},
{fDiffRatio, 50},
{fCPUenergy, 1000},
{fGPUenergy, 1000},
{fCPUenergy, 1005},
{fGPUenergy, 1005},
};
class ValueQuantity : public Quantity {
public:
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/plugins/DigiTask.cc
View file
Open in desktop
Expand Up @@ -790,7 +790,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps)
lumiCache->EvtCntLS == 1) { // Reset the bin for _cCapid_BadvsFEDvsLSmod60 at the beginning of each new LS
for (std::vector<uint32_t>::const_iterator it = _vhashFEDs.begin(); it != _vhashFEDs.end(); ++it) {
HcalElectronicsId eid = HcalElectronicsId(*it);
_cCapid_BadvsFEDvsLSmod60.setBinContent(eid, _currentLS % 50, 0);
_cCapid_BadvsFEDvsLSmod60.setBinContent(eid, _currentLS % 60, 0);
}
}

Expand Down
57 changes: 48 additions & 9 deletions DQM/HcalTasks/plugins/HcalGPUComparisonTask.cc
View file
Open in desktop
Expand Up @@ -96,10 +96,40 @@ HcalGPUComparisonTask::HcalGPUComparisonTask(edm::ParameterSet const& ps)
edm::Handle<HBHERecHitCollection> chbhe_ref;
edm::Handle<HBHERecHitCollection> chbhe_target;

if (!(e.getByToken(tokHBHE_ref_, chbhe_ref)))
_logger.dqmthrow("The CPU HBHERecHitCollection \"" + tagHBHE_ref_.encode() + "\" is not available");
if (!(e.getByToken(tokHBHE_target_, chbhe_target)))
_logger.dqmthrow("The GPU HBHERecHitCollection \"" + tagHBHE_target_.encode() + "\" is not available");
bool gotRefCollection = true, gotTargetCollection = true;

if (!(e.getByToken(tokHBHE_ref_, chbhe_ref))) {
edm::LogWarning("HcalGPUComparisonTask")
<< "The CPU HBHERecHitCollection " << tagHBHE_ref_.encode() << " is not available" << std::endl;
gotRefCollection = false;
}
if (!(e.getByToken(tokHBHE_target_, chbhe_target))) {
edm::LogWarning("HcalGPUComparisonTask")
<< "The GPU HBHERecHitCollection " << tagHBHE_target_.encode() << " is not available" << std::endl;
gotTargetCollection = false;
}

if (gotRefCollection && !gotTargetCollection) {
for (HBHERecHitCollection::const_iterator it = chbhe_ref->begin(); it != chbhe_ref->end(); ++it) {
double energy = it->energy();
HcalDetId did = it->id();
energyGPUvsCPU_subdet_.fill(did, energy, -0.5);
}
return;
}
if (!gotRefCollection && gotTargetCollection) {
for (HBHERecHitCollection::const_iterator it = chbhe_target->begin(); it != chbhe_target->end(); ++it) {
double energy = it->energy();
HcalDetId did = it->id();
energyGPUvsCPU_subdet_.fill(did, -0.5, energy);
}
return;
}
if (!gotRefCollection && !gotTargetCollection) {
edm::LogWarning("HcalGPUComparisonTask")
<< "Neither CPU nor GPU RecHit Collection available, will not fill this event." << std::endl;
return;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me suggest an optional change to make this more compact; I did not test this, so please double-check this if you want to use it.

  auto const chbhe_ref = e.getHandle(tokHBHE_ref_);
  auto const chbhe_target = e.getHandle(tokHBHE_target_);

  if (not (chbhe_ref.isValid() and chbhe_target.isValid())) {

    if (chbhe_target.isValid()) {
      edm::LogWarning("HcalGPUComparisonTask")
          << "The CPU HBHERecHitCollection " << tagHBHE_ref_.encode() << " is not available";

      for (auto const& rh : *chbhe_target)
        energyGPUvsCPU_subdet_.fill(rh.id(), -0.5, rh.energy());
    }
    else if (chbhe_ref.isValid()) {
      edm::LogWarning("HcalGPUComparisonTask")
          << "The GPU HBHERecHitCollection " << tagHBHE_target_.encode() << " is not available";

      for (auto const& rh : *chbhe_ref)
        energyGPUvsCPU_subdet_.fill(rh.id(), rh.energy(), -0.5);
    }
    else {
      edm::LogWarning("HcalGPUComparisonTask")
          << "Neither CPU nor GPU RecHit Collection available, will not fill this event.";
    }

    return;
  }


auto lumiCache = luminosityBlockCache(e.getLuminosityBlock().index());
_currentLS = lumiCache->currentLS;
Expand All @@ -115,7 +145,8 @@ HcalGPUComparisonTask::HcalGPUComparisonTask(edm::ParameterSet const& ps)
if (mRecHitEnergy.find(did) == mRecHitEnergy.end())
mRecHitEnergy.insert(std::make_pair(did, energy));
else
edm::LogError("HcalDQM|RechitTask") << "Duplicate Rechit from the same HcalDetId";
edm::LogError("HcalGPUComparisonTask") << "Duplicate Rechit from the same HcalDetId" << std::endl;
;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::endl here is not needed, as Log* calls ignore it and apply a newline regardless.

}

for (HBHERecHitCollection::const_iterator it = chbhe_target->begin(); it != chbhe_target->end(); ++it) {
Expand All @@ -140,11 +171,19 @@ HcalGPUComparisonTask::HcalGPUComparisonTask(edm::ParameterSet const& ps)
}

mRecHitEnergy.erase(did);
} else
edm::LogError("HcalDQM|RechitTask") << "GPU Rechit id not found in CPU Rechit id collection";
} else {
if (energy > 2.)
edm::LogError("HcalGPUComparisonTask")
<< "Energetic GPU Rechit exist, but not reconstructed by CPU. DetId = " << did << std::endl;
}
}
if (!mRecHitEnergy.empty()) {
for (auto const& rhpair : mRecHitEnergy) {
if (rhpair.second > 2.)
edm::LogError("HcalGPUComparisonTask")
<< "Energetic CPU Rechit exist, but not reconstructed by GPU. DetId = " << rhpair.first << std::endl;
}
}
if (!mRecHitEnergy.empty())
edm::LogError("HcalDQM|RechitTask") << "CPU Rechit id not found in GPU Rechit id collection";
}

std::shared_ptr<hcaldqm::Cache> HcalGPUComparisonTask::globalBeginLuminosityBlock(edm::LuminosityBlock const& lb,
Expand Down
4 changes: 2 additions & 2 deletions DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -102,8 +102,8 @@
# New Style Modules
#-------------------------------------
oldsubsystem = subsystem
process.hcalGPUComparisonTask.tagHBHE_ref = "hltHbherecoFromGPU"
process.hcalGPUComparisonTask.tagHBHE_target = "hltHbherecoLegacy"
process.hcalGPUComparisonTask.tagHBHE_ref = "hltHbherecoLegacy"
process.hcalGPUComparisonTask.tagHBHE_target = "hltHbherecoFromGPU"
process.hcalGPUComparisonTask.runkeyVal = runType
process.hcalGPUComparisonTask.runkeyName = runTypeName

Expand Down