From b68cecb3f04915565bbe355ed7199e3cafae9ba1 Mon Sep 17 00:00:00 2001 From: Henning Kirschenmann Date: Tue, 23 Aug 2016 22:39:58 +0200 Subject: [PATCH 1/2] do check for unlikely HO-only tower, when putting the tower into the collection, following Slava's suggestion --- RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc index a66df11002442..8343d81de3482 100644 --- a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc +++ b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc @@ -999,8 +999,8 @@ void CaloTowersCreationAlgo::convert(const CaloTowerDetId& id, const MetaTower& // insert in collection (remove and return if below threshold) - if unlikely ( (towerP4[3]==0) & (E_outer>0) ) { - collection.emplace_back(id, E_em, E_had, E_outer, -1, -1, CaloTower::PolarLorentzVector(0,hadPoint.eta(), hadPoint.phi(),0), emPoint, hadPoint); + if unlikely ( (towerP4[3]==0) & (E_outer>0) & (!theHOIsUsed) ) { + collection.emplace_back(id, E_em, E_had, E_outer, -1, -1, CaloTower::PolarLorentzVector(1e-9,hadPoint.eta(), hadPoint.phi(),0), emPoint, hadPoint); } else { collection.emplace_back(id, E_em, E_had, E_outer, -1, -1, GlobalVector(towerP4), towerP4[3], mass2, emPoint, hadPoint); } From e7b1b3752da3c03af23d8bc62f50674296534043 Mon Sep 17 00:00:00 2001 From: Henning Kirschenmann Date: Wed, 24 Aug 2016 20:53:37 +0200 Subject: [PATCH 2/2] change behavior only for theHOIsUsed==false to keep backwards-compatible; N.B.: I assume towerP4[3]==0 && E_outer>0 should only happen, if theHOIsUsed==false anyway --- .../CaloTowersCreator/src/CaloTowersCreationAlgo.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc index 8343d81de3482..bb7e0447ab299 100644 --- a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc +++ b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc @@ -999,8 +999,9 @@ void CaloTowersCreationAlgo::convert(const CaloTowerDetId& id, const MetaTower& // insert in collection (remove and return if below threshold) - if unlikely ( (towerP4[3]==0) & (E_outer>0) & (!theHOIsUsed) ) { - collection.emplace_back(id, E_em, E_had, E_outer, -1, -1, CaloTower::PolarLorentzVector(1e-9,hadPoint.eta(), hadPoint.phi(),0), emPoint, hadPoint); + if unlikely ( (towerP4[3]==0) & (E_outer>0) ) { + float val = theHOIsUsed ? 0 : 1E-9; // to keep backwards compatibility for theHOIsUsed == true + collection.emplace_back(id, E_em, E_had, E_outer, -1, -1, CaloTower::PolarLorentzVector(val,hadPoint.eta(), hadPoint.phi(),0), emPoint, hadPoint); } else { collection.emplace_back(id, E_em, E_had, E_outer, -1, -1, GlobalVector(towerP4), towerP4[3], mass2, emPoint, hadPoint); }