From 6ba169b7497277bbb5c2b65e67683a615c9c8780 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Wed, 25 Mar 2026 09:50:32 -0400 Subject: [PATCH 1/2] build: bump `coatjava` to 13.8.0, and print accumulated charge in `xcharge` --- pom.xml | 2 +- qa-physics/charge_analysis/analyze_charge.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bfde1a25..37fb8ad38 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.jlab.coat coat-libs - 13.6.0 + 13.8.0 jar diff --git a/qa-physics/charge_analysis/analyze_charge.py b/qa-physics/charge_analysis/analyze_charge.py index 19de299a8..4563d5e48 100755 --- a/qa-physics/charge_analysis/analyze_charge.py +++ b/qa-physics/charge_analysis/analyze_charge.py @@ -300,6 +300,9 @@ def main(): fig2.savefig(f'{output_dir}/chunked_fcupgated_comparison_{run_number}_{output_suffix}.png', bbox_inches='tight', dpi=300) plt.close(fig2) + print(f'TOTAL UNGATED CHARGE = {fcups[-1]-fcups[0]}') + print(f'TOTAL GATED CHARGE = {fcupgateds[-1]-fcupgateds[0]}') + if __name__ == "__main__": main() From b766acd1b015a33ef6c938aea5651f662860989b Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Wed, 25 Mar 2026 09:55:12 -0400 Subject: [PATCH 2/2] fix: use 13.8.0 for `reheat` --- bin/qtl-reheat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/qtl-reheat b/bin/qtl-reheat index 1a3e7536a..7cf171ee0 100755 --- a/bin/qtl-reheat +++ b/bin/qtl-reheat @@ -16,7 +16,9 @@ declare -A REHEAT_METHODS=( # default options dataset=train -coatjava_version=13.3.0 # the first version with rollover correction, used for RG-A Spring 2018 reheating +coatjava_version=13.8.0 # 13.3.0: first version with rollover correction, used for RG-A Spring 2018 reheating + # 13.8.0: fix: avoid call to method that recalibrates already-calibrated dsc2 + # https://github.com/JeffersonLab/coatjava/pull/1153 declare -A modes for key in submit; do modes[$key]=false