From 44b52ae908fe3910a456dd3a18b013dab0cb4b5b Mon Sep 17 00:00:00 2001 From: largewedge Date: Mon, 17 Nov 2025 10:24:17 -0500 Subject: [PATCH] revert all changes except those in CaloTowerCalib --- offline/packages/CaloReco/CaloTowerCalib.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/offline/packages/CaloReco/CaloTowerCalib.cc b/offline/packages/CaloReco/CaloTowerCalib.cc index 9aa7733f92..6cb9cd27c6 100644 --- a/offline/packages/CaloReco/CaloTowerCalib.cc +++ b/offline/packages/CaloReco/CaloTowerCalib.cc @@ -237,6 +237,13 @@ int CaloTowerCalib::process_event(PHCompositeNode *topNode) float calibconst = cdbttree->GetFloatValue(key, m_fieldname); bool isZS = caloinfo_raw->get_isZS(); + if (calibconst <= 0) + { + _calib_towers->get_tower_at_channel(channel)->set_energy(0.0); + _calib_towers->get_tower_at_channel(channel)->set_isNoCalib(true); + continue; + } + if (isZS && m_doZScrosscalib) { float crosscalibconst = cdbttree_ZScrosscalib->GetFloatValue(key, m_fieldname_ZScrosscalib); @@ -250,11 +257,6 @@ int CaloTowerCalib::process_event(PHCompositeNode *topNode) { _calib_towers->get_tower_at_channel(channel)->set_energy(raw_amplitude * calibconst); } - - if (calibconst == 0) - { - _calib_towers->get_tower_at_channel(channel)->set_isNoCalib(true); - } if(m_dotimecalib) { //timing is not useful for ZS towers