From 727d732973ee35d1d373fc7d257681d3383a3883 Mon Sep 17 00:00:00 2001 From: Virginia Bailey Date: Wed, 3 Jun 2026 14:35:11 -0400 Subject: [PATCH 1/4] add option to not do rescaling in RetowerCEMC --- offline/packages/jetbackground/RetowerCEMC.cc | 9 +++++++-- offline/packages/jetbackground/RetowerCEMC.h | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/offline/packages/jetbackground/RetowerCEMC.cc b/offline/packages/jetbackground/RetowerCEMC.cc index f9afbad6dd..890ed2cd7a 100644 --- a/offline/packages/jetbackground/RetowerCEMC.cc +++ b/offline/packages/jetbackground/RetowerCEMC.cc @@ -145,8 +145,13 @@ int RetowerCEMC::process_event(PHCompositeNode *topNode) } else { - towerinfo->set_energy(retower_e_temp / (double) (1 - scalefactor)); - if (retower_e_temp == 0) + if(_do_rescale) + { + towerinfo->set_energy(retower_e_temp / (double) (1 - scalefactor)); + } + else towerinfo->set_energy(retower_e_temp); + + if (retower_e_temp == 0) { towerinfo->set_time(0); } diff --git a/offline/packages/jetbackground/RetowerCEMC.h b/offline/packages/jetbackground/RetowerCEMC.h index 3edb6fd112..20661d3518 100644 --- a/offline/packages/jetbackground/RetowerCEMC.h +++ b/offline/packages/jetbackground/RetowerCEMC.h @@ -18,6 +18,7 @@ class RetowerCEMC : public SubsysReco void SetEnergyDistribution(int val) { _weighted_energy_distribution = val; } void set_frac_cut(double frac_cut) { _frac_cut = frac_cut; } + void set_do_rescale(bool do_rescale) {_do_rescale = do_rescale;} void set_towerinfo(bool use_towerinfo) { m_use_towerinfo = use_towerinfo; } void set_towerNodePrefix(const std::string &prefix) { @@ -32,7 +33,8 @@ class RetowerCEMC : public SubsysReco void get_weighted_fraction(PHCompositeNode *topNode); int _weighted_energy_distribution{1}; - double _frac_cut{0.5}; + double _frac_cut{1}; + bool _do_rescale{false}; bool m_use_towerinfo{false}; std::string m_towerNodePrefix{"TOWERINFO_CALIB"}; From 7d93cb5d96875dbe87f870924c66912edaccd7e7 Mon Sep 17 00:00:00 2001 From: Virginia Bailey Date: Wed, 3 Jun 2026 16:41:11 -0400 Subject: [PATCH 2/4] store bad tower fraction even if tower is masked --- offline/packages/jetbackground/RetowerCEMC.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline/packages/jetbackground/RetowerCEMC.cc b/offline/packages/jetbackground/RetowerCEMC.cc index 890ed2cd7a..7ed0409f04 100644 --- a/offline/packages/jetbackground/RetowerCEMC.cc +++ b/offline/packages/jetbackground/RetowerCEMC.cc @@ -159,8 +159,8 @@ int RetowerCEMC::process_event(PHCompositeNode *topNode) { towerinfo->set_time((retower_time_temp / retower_e_temp)); } - towerinfo->set_chi2(scalefactor); } + towerinfo->set_chi2(scalefactor); //store the fraction of bad towers as the chi2 } } } From 8d386e95729cf8c5a55840b1db142ed8ce4f6e98 Mon Sep 17 00:00:00 2001 From: Virginia Bailey Date: Thu, 4 Jun 2026 18:18:33 -0400 Subject: [PATCH 3/4] clang tidy --- offline/packages/jetbackground/RetowerCEMC.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/offline/packages/jetbackground/RetowerCEMC.cc b/offline/packages/jetbackground/RetowerCEMC.cc index 7ed0409f04..9b896a1c48 100644 --- a/offline/packages/jetbackground/RetowerCEMC.cc +++ b/offline/packages/jetbackground/RetowerCEMC.cc @@ -149,7 +149,8 @@ int RetowerCEMC::process_event(PHCompositeNode *topNode) { towerinfo->set_energy(retower_e_temp / (double) (1 - scalefactor)); } - else towerinfo->set_energy(retower_e_temp); + else { towerinfo->set_energy(retower_e_temp); +} if (retower_e_temp == 0) { From 25eecda311902299ca488b54b7e02fe361266675 Mon Sep 17 00:00:00 2001 From: Chris Pinkenburg Date: Fri, 5 Jun 2026 00:43:47 -0400 Subject: [PATCH 4/4] fix clang-tidy, use consistent initializers --- offline/packages/jetbackground/RetowerCEMC.cc | 18 +++++++------ offline/packages/jetbackground/RetowerCEMC.h | 26 +++++++++---------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/offline/packages/jetbackground/RetowerCEMC.cc b/offline/packages/jetbackground/RetowerCEMC.cc index 9b896a1c48..9543f0e75b 100644 --- a/offline/packages/jetbackground/RetowerCEMC.cc +++ b/offline/packages/jetbackground/RetowerCEMC.cc @@ -145,14 +145,16 @@ int RetowerCEMC::process_event(PHCompositeNode *topNode) } else { - if(_do_rescale) - { - towerinfo->set_energy(retower_e_temp / (double) (1 - scalefactor)); - } - else { towerinfo->set_energy(retower_e_temp); -} + if (_do_rescale) + { + towerinfo->set_energy(retower_e_temp / (double) (1 - scalefactor)); + } + else + { + towerinfo->set_energy(retower_e_temp); + } - if (retower_e_temp == 0) + if (retower_e_temp == 0) { towerinfo->set_time(0); } @@ -161,7 +163,7 @@ int RetowerCEMC::process_event(PHCompositeNode *topNode) towerinfo->set_time((retower_time_temp / retower_e_temp)); } } - towerinfo->set_chi2(scalefactor); //store the fraction of bad towers as the chi2 + towerinfo->set_chi2(scalefactor); // store the fraction of bad towers as the chi2 } } } diff --git a/offline/packages/jetbackground/RetowerCEMC.h b/offline/packages/jetbackground/RetowerCEMC.h index 20661d3518..3c48a057ce 100644 --- a/offline/packages/jetbackground/RetowerCEMC.h +++ b/offline/packages/jetbackground/RetowerCEMC.h @@ -18,7 +18,7 @@ class RetowerCEMC : public SubsysReco void SetEnergyDistribution(int val) { _weighted_energy_distribution = val; } void set_frac_cut(double frac_cut) { _frac_cut = frac_cut; } - void set_do_rescale(bool do_rescale) {_do_rescale = do_rescale;} + void set_do_rescale(bool do_rescale) { _do_rescale = do_rescale; } void set_towerinfo(bool use_towerinfo) { m_use_towerinfo = use_towerinfo; } void set_towerNodePrefix(const std::string &prefix) { @@ -38,21 +38,21 @@ class RetowerCEMC : public SubsysReco bool m_use_towerinfo{false}; std::string m_towerNodePrefix{"TOWERINFO_CALIB"}; - static const int neta_ihcal = 24; - static const int neta_emcal = 96; - static const int nphi_ihcal = 64; - static const int nphi_emcal = 256; + static const int neta_ihcal{24}; + static const int neta_emcal{96}; + static const int nphi_ihcal{64}; + static const int nphi_emcal{256}; - int retower_lowerbound_originaltower_ieta[neta_ihcal] = {0}; - int retower_upperbound_originaltower_ieta[neta_ihcal] = {0}; - double retower_lowerbound_originaltower_fraction[neta_ihcal] = {0.0}; - double retower_upperbound_originaltower_fraction[neta_ihcal] = {0.0}; - double retower_totalarea[neta_ihcal] = {0.0}; + int retower_lowerbound_originaltower_ieta[neta_ihcal]{0}; + int retower_upperbound_originaltower_ieta[neta_ihcal]{0}; + double retower_lowerbound_originaltower_fraction[neta_ihcal]{0.0}; + double retower_upperbound_originaltower_fraction[neta_ihcal]{0.0}; + double retower_totalarea[neta_ihcal]{0.0}; int retower_first_lowerbound_originaltower_iphi{-1}; - double rawtower_e[neta_emcal][nphi_emcal] = {{0.0}}; - double rawtower_time[neta_emcal][nphi_emcal] = {{0.0}}; - int rawtower_status[neta_emcal][nphi_emcal] = {{0}}; + double rawtower_e[neta_emcal][nphi_emcal]{{0.0}}; + double rawtower_time[neta_emcal][nphi_emcal]{{0.0}}; + int rawtower_status[neta_emcal][nphi_emcal]{{0}}; std::string EMTowerName; std::string IHTowerName;