Skip to content

LIMS-2055: Use Compton cutoff energy from the results file #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndg63276 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

LIMS-2055: Use Compton cutoff energy from the results file #1043

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e197596
LIMS-2055: Use Compton cutoff energy from the results file
Mar 5, 2026
60ccc26
LIMS-2055: Don't use colon as line split
Mar 9, 2026
707a720
LIMS-2055: str_contains is PHP8 only
Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 39 additions & 24 deletions api/src/Page/DC.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,24 +1212,6 @@ function _mca($id)
$this->db->close();

$data = array(array(), array());
if (file_exists($info['DAT'])) {
$dat = explode("\n", file_get_contents($info['DAT']));

foreach ($dat as $i => $d) {
if ($i > 2 && $d) {
list($e, $v) = preg_split('/\s+/', trim($d));
if ($i % 2 == 1) {
if (floatval($e) <= $info['ENERGY']) {
if (floatval($e) > ($info['ENERGY'] - 1100))
array_push($data[1], array(floatval($e), floatval($v)));
else
array_push($data[0], array(floatval($e), floatval($v)));
}
}
}
}
}


# pymca
$results = str_replace('.mca', '.results.dat', preg_replace('/(data\/\d\d\d\d\/\w\w\d+-\d+)/', '\1/processed/pymca', $info['DIR']));
Expand All @@ -1238,23 +1220,56 @@ function _mca($id)
$elements = array();
$el_no_match = array();
$max_counts = 0;
$line_number = 0;
$max_elements = 5;
$compton_cutoff = $info['ENERGY'] - 1100;

if (file_exists($results)) {
$dat = explode("\n", file_get_contents($results));
foreach ($dat as $i => $d) {
if ($i < 5) {
foreach ($dat as $d) {
if (empty($d) || strpos($d, '#') === 0) {
if (strpos($d, 'COMPTON_CUTOFF_EV') !== false) {
$parts = explode('COMPTON_CUTOFF_EV', $d);
$compton_cutoff = floatval(trim($parts[1]));
}
continue;
}
if ($line_number < $max_elements) {
$l = explode(' ', $d);
if ($i == 0)
if ($line_number == 0) {
$max_counts = floatval($l[1]);
}
if (array_key_exists($l[0], $el_to_en)) {
$els = $el_to_en[$l[0]];
if (($els[sizeof($els) - 1] * 1000) < ($info['ENERGY'] - 1000))
$elements[$l[0]] = array(array_map('floatval', $els), floatval($l[1]), floatval($l[2]));
} else
$elements[$l[0]] = array(array_map('floatval', $els), floatval($l[1]), floatval($l[2]));
} else {
array_push($el_no_match, $l[0]);
}
$line_number++;
} else {
break;
}
}
}

if (file_exists($info['DAT'])) {
$dat = explode("\n", file_get_contents($info['DAT']));

foreach ($dat as $i => $d) {
if ($i > 2 && $d) {
list($e, $v) = preg_split('/\s+/', trim($d));
if ($i % 2 == 1) {
if (floatval($e) <= $info['ENERGY']) {
if (floatval($e) > $compton_cutoff)
array_push($data[1], array(floatval($e), floatval($v)));
else
array_push($data[0], array(floatval($e), floatval($v)));
}
}
}
}
}

array_push($data, $elements);
array_push($data, $el_no_match);
array_push($data, $max_counts);
Expand Down
Loading