|
@@ -73,8 +73,8 @@ $selected_csv = isset($_GET["csv_file"])&&in_array($_GET["csv_file"], $cleanArrs
|
|
|
<script>
|
|
|
function makeplot(){
|
|
|
Plotly.d3.csv('<?echo $url_total_info;?>', (allRows)=>{
|
|
|
- const {mean_energy, mean_spread} = parseResultsTable(allRows, "<?echo $selected_csv;?>");
|
|
|
- Plotly.d3.csv('<?echo $url.$selected_csv;?>', function(data){processData(data, mean_energy, mean_spread)});
|
|
|
+ const {mean_energy, mean_spread, mean_energy_stat_err} = parseResultsTable(allRows, "<?echo $selected_csv;?>");
|
|
|
+ Plotly.d3.csv('<?echo $url.$selected_csv;?>', function(data){processData(data, mean_energy, mean_spread, mean_energy_stat_err)});
|
|
|
}
|
|
|
);
|
|
|
}
|
|
@@ -166,7 +166,7 @@ $selected_csv = isset($_GET["csv_file"])&&in_array($_GET["csv_file"], $cleanArrs
|
|
|
return EL/sL;
|
|
|
}
|
|
|
|
|
|
- function processData(allRows, mean_energy, mean_spread) {
|
|
|
+ function processData(allRows, mean_energy, mean_spread, mean_energy_stat_err) {
|
|
|
// Processes all data rows
|
|
|
var dict = {};
|
|
|
dict['x'] = [];
|
|
@@ -200,6 +200,7 @@ $selected_csv = isset($_GET["csv_file"])&&in_array($_GET["csv_file"], $cleanArrs
|
|
|
dict['mean_energy_total'] = mean_energy;
|
|
|
dict['old_mean_energy_total'] = oldAverage(dict['e_mean'], dict['lum']);
|
|
|
dict['mean_spread_total'] = mean_spread;
|
|
|
+ dict['mean_energy_stat_err'] = mean_energy_stat_err;
|
|
|
|
|
|
makePlotly(dict, "gd");
|
|
|
}
|
|
@@ -269,12 +270,12 @@ $selected_csv = isset($_GET["csv_file"])&&in_array($_GET["csv_file"], $cleanArrs
|
|
|
var traces = [trace1, trace2, trace3];
|
|
|
|
|
|
var updatemenus = [];
|
|
|
- // console.log(dict);
|
|
|
+ console.log(dict);
|
|
|
if (dict['mean_energy_total']){
|
|
|
updatemenus = [{
|
|
|
buttons: [
|
|
|
{
|
|
|
- args:[{'shapes[0].visible': true, 'shapes[1].visible': false, 'title': '<E> = ' + parseFloat(dict['mean_energy_total']).toFixed(3) + ' MeV, ' + '<Spread> = ' + parseFloat(dict['mean_spread_total']).toFixed(3) + ' MeV',}],
|
|
|
+ args:[{'shapes[0].visible': true, 'shapes[1].visible': false, 'title': '<E> = ' + parseFloat(dict['mean_energy_total']).toFixed(3) + '±' + parseFloat(dict['mean_energy_stat_err']).toFixed(3) + ' MeV, ' + '<Spread> = ' + parseFloat(dict['mean_spread_total']).toFixed(3) + ' MeV',}],
|
|
|
label: 'Current average method',
|
|
|
method: 'relayout'
|
|
|
}, {
|
|
@@ -294,7 +295,7 @@ $selected_csv = isset($_GET["csv_file"])&&in_array($_GET["csv_file"], $cleanArrs
|
|
|
}
|
|
|
|
|
|
var layout = {
|
|
|
- title: '<E> = ' + parseFloat(dict['mean_energy_total']).toFixed(3) + ' MeV, ' + '<Spread> = ' + parseFloat(dict['mean_spread_total']).toFixed(3) + ' MeV',
|
|
|
+ title: '<E> = ' + parseFloat(dict['mean_energy_total']).toFixed(3) + '±' + parseFloat(dict['mean_energy_stat_err']).toFixed(3) + ' MeV, ' + '<Spread> = ' + parseFloat(dict['mean_spread_total']).toFixed(3) + ' MeV',
|
|
|
updatemenus: updatemenus,
|
|
|
font: {
|
|
|
size: 16,
|