Fix: CsI(Tl) non-linear response correction + detector calibration overhaul
Root cause of Am-241 misidentification: the Radiacode 103's CsI(Tl) crystal shifts low-energy peaks upward (59.5 keV → 71.6 keV for Am-241) due to non-proportional scintillation response. The model was trained on theoretical peak positions and couldn't match the shifted real peaks. Changes: - Add inverse CsI(Tl) non-linear correction to inference pipeline (radiacode_monitor.py, web/config.py, test_detection.py) E_apparent = E_true * (1 + 0.37 * exp(-E_true/100)) Corrects channel mapping so peaks appear at theoretical energies - Fix energy calibration: DetectorConfig now uses E = 0.33 + 2.97*ch with 1023 channels, matching the real detector (was energy_min=20, skip_first_channel=True, different channel width) - Add K-escape peaks for CsI(Tl) iodine X-ray escape (E - 28.5 keV) - Add asymmetric peak shapes for low-energy tails (< 200 keV) - Add log1p normalization in dataset and inference (replaces max-norm) - Add background-subtracted training mode (subtract_background flag) - Add low-signal augmentation (0.01-5 Bq activities, 30-300s durations) - Update docker-compose.yml: batch_size=32, duration=30-300s, CSI_NONLINEAR_ALPHA/BETA env vars for detect and web - Web dashboard: apply CsI correction to displayed spectra - Various UI fixes (Chart.js width, zoom/pan, isotope lines) Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@ -68,18 +68,29 @@ nav a {
|
||||
nav a:hover { background: rgba(255,255,255,0.1); }
|
||||
nav a.active { color: var(--accent-bright); border-bottom: 2px solid var(--accent-bright); }
|
||||
|
||||
main { padding: 16px; }
|
||||
main { padding: 12px 0; }
|
||||
|
||||
.tab-content { display: none; }
|
||||
.tab-content.active { display: block; }
|
||||
|
||||
.controls, .bg-stats, #isotopes-table, #peaks-table, .history-item, .chart-header {
|
||||
margin-left: 12px;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
.chart-container {
|
||||
background: var(--bg-card);
|
||||
border-radius: 8px;
|
||||
padding: 12px;
|
||||
margin-bottom: 12px;
|
||||
margin: 0 12px 12px 12px;
|
||||
height: 450px;
|
||||
width: calc(100% - 24px);
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.chart-container canvas {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.controls {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Radiacode 103 — Dashboard</title>
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=3">
|
||||
<link rel="stylesheet" href="/static/css/style.css?v=8">
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-annotation@3.0.1/dist/chartjs-plugin-annotation.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8/hammer.min.js"></script>
|
||||
@ -83,12 +83,12 @@
|
||||
</section>
|
||||
</main>
|
||||
|
||||
<script src="/static/js/isotope_lines.js?v=3"></script>
|
||||
<script src="/static/js/isotope_lines.js?v=5"></script>
|
||||
<script src="/static/js/chart_pan.js?v=3"></script>
|
||||
<script src="/static/js/spectrum.js?v=9"></script>
|
||||
<script src="/static/js/spectrum.js?v=15"></script>
|
||||
<script src="/static/js/history.js?v=2"></script>
|
||||
<script src="/static/js/background.js?v=30"></script>
|
||||
<script src="/static/js/cps.js?v=7"></script>
|
||||
<script src="/static/js/background.js?v=34"></script>
|
||||
<script src="/static/js/cps.js?v=8"></script>
|
||||
<script src="/static/js/app.js?v=3"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -6,11 +6,11 @@ let bgContinuumData = null;
|
||||
document.getElementById('reset-zoom-bg')?.addEventListener('click', () => {
|
||||
if (bgChart) {
|
||||
bgChart.resetZoom();
|
||||
// After resetZoom, force the scale to full energy range
|
||||
delete bgChart._panRange;
|
||||
const firstPt = bgChart.data.datasets[0]?.data?.[0];
|
||||
const lastPt = bgChart.data.datasets[0]?.data?.[bgChart.data.datasets[0].data.length - 1];
|
||||
const fullMin = firstPt?.x ?? 0;
|
||||
const fullMax = lastPt?.x ?? 3036;
|
||||
const fullMax = lastPt?.x ?? 3000;
|
||||
bgChart.options.scales.x.min = fullMin;
|
||||
bgChart.options.scales.x.max = fullMax;
|
||||
bgChart.update();
|
||||
@ -170,12 +170,12 @@ function updateBackgroundChart(spec) {
|
||||
datasets: datasets,
|
||||
};
|
||||
|
||||
// Preserve pan range (user zoomed), but reset to full range when data refreshes
|
||||
// Preserve pan range only if user has explicitly zoomed/panned
|
||||
const panRange = bgChart?._panRange;
|
||||
const firstX = datasets[0].data[0]?.x;
|
||||
const lastX = datasets[0].data[datasets[0].data.length - 1]?.x;
|
||||
const xMin = panRange ? panRange[0] : (firstX ?? 0);
|
||||
const xMax = panRange ? panRange[1] : (lastX ?? 3036);
|
||||
const firstX = datasets[0].data[0]?.x ?? 0;
|
||||
const lastX = datasets[0].data[datasets[0].data.length - 1]?.x ?? 3000;
|
||||
const xMin = panRange ? panRange[0] : firstX;
|
||||
const xMax = panRange ? panRange[1] : lastX;
|
||||
const options = {
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
@ -214,8 +214,8 @@ function updateBackgroundChart(spec) {
|
||||
},
|
||||
y: {
|
||||
type: showLog ? 'logarithmic' : 'linear',
|
||||
min: showLog ? 0.5 : undefined,
|
||||
title: { display: true, text: `Comptages (${showLog ? 'log' : 'lin'})`, color: '#888' },
|
||||
...(showLog ? { min: 0.9 } : {}),
|
||||
ticks: { color: '#888' },
|
||||
grid: { color: '#333' },
|
||||
}
|
||||
@ -229,7 +229,7 @@ function updateBackgroundChart(spec) {
|
||||
} else {
|
||||
bgChart = new Chart(ctx, { type: 'line', data: chartData, ...options });
|
||||
const firstX = datasets[0].data[0]?.x ?? 0;
|
||||
const lastX = datasets[0].data[datasets[0].data.length - 1]?.x ?? 3036;
|
||||
const lastX = datasets[0].data[datasets[0].data.length - 1]?.x ?? 3000;
|
||||
enablePan(bgChart, 'reset-zoom-bg', firstX, lastX);
|
||||
}
|
||||
}
|
||||
|
||||
@ -41,10 +41,9 @@ function updateCpsChart(labels, values) {
|
||||
}]
|
||||
};
|
||||
|
||||
const existingMin = cpsChart?.scales.x?.min;
|
||||
const existingMax = cpsChart?.scales.x?.max;
|
||||
const xMin = existingMin ?? labels[0];
|
||||
const xMax = existingMax ?? labels[labels.length - 1];
|
||||
const panRange = cpsChart?._panRange;
|
||||
const xMin = panRange ? panRange[0] : labels[0];
|
||||
const xMax = panRange ? panRange[1] : labels[labels.length - 1];
|
||||
const options = {
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
@ -114,10 +113,15 @@ function updateCpsChart(labels, values) {
|
||||
}
|
||||
}
|
||||
|
||||
// Reset zoom
|
||||
// Reset zoom — restore full time range
|
||||
document.getElementById('reset-zoom-cps')?.addEventListener('click', () => {
|
||||
if (cpsChart) {
|
||||
cpsChart.resetZoom();
|
||||
delete cpsChart._panRange;
|
||||
const labels = cpsChart.data.labels;
|
||||
cpsChart.options.scales.x.min = labels[0];
|
||||
cpsChart.options.scales.x.max = labels[labels.length - 1];
|
||||
cpsChart.update();
|
||||
document.getElementById('reset-zoom-cps').style.display = 'none';
|
||||
}
|
||||
});
|
||||
@ -48,7 +48,7 @@ const ISOTOPE_LINES = [
|
||||
];
|
||||
|
||||
// Filtrer les lignes dans la plage visible du détecteur (30-3050 keV pour Radiacode 103)
|
||||
const VISIBLE_LINES = ISOTOPE_LINES.filter(l => l.energy_keV >= 30 && l.energy_keV <= 3050);
|
||||
const VISIBLE_LINES = ISOTOPE_LINES.filter(l => l.energy_keV >= 30 && l.energy_keV <= 3000);
|
||||
|
||||
// Global crosshair plugin — vertical dashed line on hover for all charts
|
||||
const CrosshairPlugin = {
|
||||
@ -72,6 +72,50 @@ const CrosshairPlugin = {
|
||||
};
|
||||
Chart.register(CrosshairPlugin);
|
||||
|
||||
// Auto-scale Y axis to visible X range
|
||||
const AutoScaleYPlugin = {
|
||||
id: 'autoScaleY',
|
||||
beforeUpdate(chart) {
|
||||
const xScale = chart.scales?.x;
|
||||
const yScale = chart.scales?.y;
|
||||
if (!xScale || !yScale || xScale.type !== 'linear') return;
|
||||
|
||||
const xMin = xScale.min;
|
||||
const xMax = xScale.max;
|
||||
if (xMin == null || xMax == null) return;
|
||||
|
||||
let yMin = Infinity;
|
||||
let yMax = -Infinity;
|
||||
let count = 0;
|
||||
|
||||
chart.data.datasets.forEach(ds => {
|
||||
for (const pt of ds.data) {
|
||||
const x = Array.isArray(pt) ? pt[0] : pt.x;
|
||||
const y = Array.isArray(pt) ? pt[1] : pt.y;
|
||||
if (x === undefined || y === undefined) continue;
|
||||
if (x >= xMin && x <= xMax) {
|
||||
if (y > 0 && y < yMin) yMin = y;
|
||||
if (y > yMax) yMax = y;
|
||||
count++;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (count === 0 || yMin === Infinity) return;
|
||||
|
||||
const isLog = yScale.type === 'logarithmic';
|
||||
if (isLog) {
|
||||
chart.options.scales.y.min = Math.max(0.5, yMin * 0.7);
|
||||
chart.options.scales.y.max = yMax * 1.5;
|
||||
} else {
|
||||
const padding = (yMax - yMin) * 0.05 || 1;
|
||||
chart.options.scales.y.min = Math.max(0, yMin - padding);
|
||||
chart.options.scales.y.max = yMax + padding;
|
||||
}
|
||||
}
|
||||
};
|
||||
Chart.register(AutoScaleYPlugin);
|
||||
|
||||
// Couleurs par catégorie d'isotope
|
||||
function isotopeLineColor(isotope) {
|
||||
if (["K-40", "Bi-214", "Pb-214", "Ra-226"].includes(isotope)) return "rgba(255,152,0,0.5)"; // Uranium chain - orange
|
||||
|
||||
@ -22,22 +22,29 @@ function updateSpectrumChart(data) {
|
||||
const showBgOverlay = document.getElementById('show-bg-overlay').checked;
|
||||
const ctx = document.getElementById('spectrum-chart').getContext('2d');
|
||||
|
||||
const toData = (counts, energies) => counts.map((v, i) => ({ x: energies[i], y: v }));
|
||||
const energy = data.energy_kev;
|
||||
|
||||
const datasets = [{
|
||||
label: data.background_subtracted ? 'Spectre (background soustrait)' : 'Spectre cumulé',
|
||||
data: data.counts,
|
||||
data: toData(data.counts, energy),
|
||||
borderColor: '#4fc3f7',
|
||||
backgroundColor: 'rgba(79, 195, 247, 0.1)',
|
||||
borderWidth: 1,
|
||||
pointRadius: 0,
|
||||
fill: true,
|
||||
fill: logScale ? 'origin' : true,
|
||||
tension: 0.1,
|
||||
}];
|
||||
|
||||
// Overlay background if requested and available
|
||||
// Overlay background if requested and available, scaled to match spectrum max
|
||||
if (showBgOverlay && bgOverlayData) {
|
||||
const specMax = Math.max(...data.counts);
|
||||
const bgMax = Math.max(...bgOverlayData.counts);
|
||||
const bgScale = bgMax > 0 ? specMax / bgMax : 1;
|
||||
const bgEnergy = bgOverlayData.energy_kev || energy;
|
||||
datasets.push({
|
||||
label: 'Background',
|
||||
data: bgOverlayData.counts,
|
||||
data: bgOverlayData.counts.map((v, i) => ({ x: bgEnergy[i] ?? energy[i], y: v * bgScale })),
|
||||
borderColor: 'rgba(255, 152, 0, 0.6)',
|
||||
backgroundColor: 'rgba(255, 152, 0, 0.05)',
|
||||
borderWidth: 1,
|
||||
@ -48,7 +55,6 @@ function updateSpectrumChart(data) {
|
||||
}
|
||||
|
||||
const chartData = {
|
||||
labels: data.energy_kev,
|
||||
datasets: datasets,
|
||||
};
|
||||
|
||||
@ -58,10 +64,11 @@ function updateSpectrumChart(data) {
|
||||
annotations = buildIsotopeAnnotations(detectedOnly, (data.isotopes_detected || []).map(i => i.isotope));
|
||||
}
|
||||
|
||||
const existingMin = spectrumChart?.scales.x?.min;
|
||||
const existingMax = spectrumChart?.scales.x?.max;
|
||||
const xMin = existingMin ?? data.energy_kev[0];
|
||||
const xMax = existingMax ?? data.energy_kev[data.energy_kev.length - 1];
|
||||
const firstPt = datasets[0].data[0];
|
||||
const lastPt = datasets[0].data[datasets[0].data.length - 1];
|
||||
const panRange = spectrumChart?._panRange;
|
||||
const xMin = panRange ? panRange[0] : (firstPt?.x ?? 0);
|
||||
const xMax = panRange ? panRange[1] : (lastPt?.x ?? 3000);
|
||||
const options = {
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
@ -73,13 +80,10 @@ function updateSpectrumChart(data) {
|
||||
enabled: true,
|
||||
mode: 'index',
|
||||
intersect: false,
|
||||
filter: (item) => item.raw != null,
|
||||
filter: (item) => item.parsed.y != null,
|
||||
callbacks: {
|
||||
title: (items) => {
|
||||
const idx = items[0].dataIndex;
|
||||
return `${data.energy_kev[idx]} keV`;
|
||||
},
|
||||
label: (item) => `${item.dataset.label}: ${item.raw.toFixed(1)} counts`
|
||||
title: (items) => `${items[0].parsed.x.toFixed(1)} keV`,
|
||||
label: (item) => `${item.dataset.label}: ${item.parsed.y.toFixed(1)} counts`
|
||||
}
|
||||
},
|
||||
annotation: {
|
||||
@ -108,8 +112,8 @@ function updateSpectrumChart(data) {
|
||||
},
|
||||
y: {
|
||||
type: logScale ? 'logarithmic' : 'linear',
|
||||
min: logScale ? 0.5 : undefined,
|
||||
title: { display: true, text: logScale ? 'Comptages (log)' : 'Comptages', color: '#888' },
|
||||
min: logScale ? 0.9 : undefined,
|
||||
ticks: { color: '#888' },
|
||||
grid: { color: '#333' },
|
||||
}
|
||||
@ -122,7 +126,12 @@ function updateSpectrumChart(data) {
|
||||
spectrumChart.update();
|
||||
} else {
|
||||
spectrumChart = new Chart(ctx, { type: 'line', data: chartData, ...options });
|
||||
enablePan(spectrumChart, 'reset-zoom-spectrum', data.energy_kev[0], data.energy_kev[data.energy_kev.length - 1]);
|
||||
const panMin = firstPt?.x ?? 0;
|
||||
const panMax = lastPt?.x ?? 3000;
|
||||
enablePan(spectrumChart, 'reset-zoom-spectrum', panMin, panMax);
|
||||
// Fix: Chart.js may read wrong canvas dimensions on first render;
|
||||
// resize on next frame ensures layout is fully computed.
|
||||
requestAnimationFrame(() => spectrumChart.resize());
|
||||
}
|
||||
}
|
||||
|
||||
@ -166,10 +175,16 @@ document.getElementById('show-bg-overlay').addEventListener('change', async (e)
|
||||
refreshSpectrum();
|
||||
});
|
||||
|
||||
// Reset zoom
|
||||
// Reset zoom — restore full energy range
|
||||
document.getElementById('reset-zoom-spectrum')?.addEventListener('click', () => {
|
||||
if (spectrumChart) {
|
||||
spectrumChart.resetZoom();
|
||||
delete spectrumChart._panRange;
|
||||
const firstPt = spectrumChart.data.datasets[0]?.data?.[0];
|
||||
const lastPt = spectrumChart.data.datasets[0]?.data?.[spectrumChart.data.datasets[0].data.length - 1];
|
||||
spectrumChart.options.scales.x.min = firstPt?.x ?? 0;
|
||||
spectrumChart.options.scales.x.max = lastPt?.x ?? 3000;
|
||||
spectrumChart.update();
|
||||
document.getElementById('reset-zoom-spectrum').style.display = 'none';
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user