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

Omit calibration channels and invalid data in HCAL TP emulation #19105

Merged
merged 2 commits into from Jun 13, 2017
Merged

Omit calibration channels and invalid data in HCAL TP emulation #19105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88cf4b4
Omit calibration channels and invalid data in HCAL TP emulation
christopheralanwest Jun 5, 2017
78e17e3
Do not exclude ngHB dataframes from TP emulation
christopheralanwest Jun 6, 2017
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
10 changes: 10 additions & 0 deletions SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc
View file
Open in desktop
Expand Up @@ -197,6 +197,10 @@ void HcalTriggerPrimitiveAlgo::addSignal(const HFDataFrame & frame) {
void
HcalTriggerPrimitiveAlgo::addSignal(const QIE10DataFrame& frame)
{
HcalDetId detId = frame.detid();
// prevent QIE10 calibration channels from entering TP emulation
if(detId.subdet() != HcalForward) return;

auto ids = theTrigTowerGeometry->towerIds(frame.id());
for (const auto& id: ids) {
if (id.version() == 0) {
Expand Down Expand Up @@ -228,6 +232,9 @@ void
HcalTriggerPrimitiveAlgo::addSignal(const QIE11DataFrame& frame)
{
HcalDetId detId(frame.id());
// prevent QIE11 calibration channels from entering TP emulation
if(detId.subdet() != HcalEndcap && detId.subdet() != HcalBarrel) return;

std::vector<HcalTrigTowerDetId> ids = theTrigTowerGeometry->towerIds(detId);
assert(ids.size() == 1 || ids.size() == 2);
IntegerCaloSamples samples1(ids[0], int(frame.samples()));
Expand Down Expand Up @@ -527,6 +534,9 @@ void HcalTriggerPrimitiveAlgo::analyzeHF2016(
bool
HcalTriggerPrimitiveAlgo::validChannel(const QIE10DataFrame& digi, int ts) const
{
// channels with invalid data should not contribute to the sum
if(digi.linkError() || ts>=digi.samples() || !digi[ts].ok()) return false;

auto mask = conditions_->getHcalTPChannelParameter(HcalDetId(digi.id()))->getMask();
if (mask)
return false;
Expand Down