diff --git a/heliosmatics.html b/heliosmatics.html index d861df7..6719f1e 100644 --- a/heliosmatics.html +++ b/heliosmatics.html @@ -4,25 +4,58 @@ Heliosmatics + @@ -30,7 +63,7 @@

HELIOSmatics

-
+

24F(d,p)25F@10MeV/u

@@ -41,6 +74,7 @@ Beam Ex: MeV + Target (a): @@ -59,6 +93,8 @@ +

+

@@ -81,19 +117,20 @@ - + - + - - - + + + +
B-field: T
Beam Energy: MeV/u
min Beam Energy:-1.107MeV/u
@@ -155,18 +192,18 @@ θCM: deg - + Array Pos: mm - + Recoil Pos: mm - + @@ -178,17 +215,17 @@ @@ -199,29 +236,29 @@
-
+
- +
- +
eRange: MeV
@@ -237,11 +274,12 @@ -
+ -

+--> -
+

This page is created and hosted by Fox's Lab (FSU) in collabortion with SOLARIS (FRIB).

The SOLARIS project is based on HELIOS (ANL) and is leaded by ANL.

The ISS (ISOLDE Solenoidal Spectrometer) is located as CERN.

- - - - - - - + + + + + + +

Contact: Ryan Tang (rtang at fsu.edu) @@ -350,8 +388,8 @@ function addRow() { let table = document.getElementById("ExTable"); let nRow = table.rows.length; let row = table.insertRow(nRow-1); - row.innerHTML = ' \ - \ + row.innerHTML = ' \ + \ \ \ \ @@ -362,8 +400,15 @@ function addRow() { \ \ '; + CalculateEZ(); CalculateRZ(); + + //let table2 = document.getElementById("DWBATable"); + //row = table2.insertRow(nRow-1); + //row.innerHTML = ' \ + // \ + // '; } function deleteRow(){ @@ -374,13 +419,18 @@ function deleteRow(){ } CalculateEZ(); CalculateRZ(); + + //let table2 = document.getElementById("DWBATable"); + //if ( nRow > 3){ + // table2.deleteRow(nRow-2); + //} } -var beam = []; //A, Z, Mass, Name +var beam = []; //A, Z, Mass, Name, Sn, Sp, Sa var beamMass; var target= []; var light=[]; -var heavy=[]; +var heavy=[]; //A, Z, Mass, Name, Sn, Sp, Sa var beamEx; var BField; @@ -450,6 +500,9 @@ function GetMassFromSym(AZ, id){ beam[1] = parseInt(mass[1]); beam[2] = parseFloat(mass[2]); beam[3] = AZ; + beam[4] = parseFloat(mass[4]); + beam[5] = parseFloat(mass[5]); + beam[6] = parseFloat(mass[6]); } if( id == 1 ){ target[0] = parseInt(mass[0]); @@ -476,7 +529,10 @@ function GetMassFromAZ(A,Z){ client.onreadystatechange = function() { let mass = client.responseText.split(","); heavy[2] = parseFloat(mass[2]); - heavy[3] = mass[3].replace(/\s/g, ''); + heavy[3] = mass[3]?.trim(); + heavy[4] = parseFloat(mass[4]); + heavy[5] = parseFloat(mass[5]); + heavy[6] = parseFloat(mass[6]); } client.open('GET', str, false); client.send(); @@ -484,20 +540,19 @@ function GetMassFromAZ(A,Z){ } function GetMass(){ - let beam_AZ = document.getElementById('beam').value; - GetMassFromSym(beam_AZ, 0); - let target_AZ = document.getElementById('target').value; - GetMassFromSym(target_AZ, 1); - let light_AZ = document.getElementById('light').value; - GetMassFromSym(light_AZ, 2); + + GetMassFromSym(document.getElementById('beam').value, 0); + GetMassFromSym(document.getElementById('target').value, 1); + GetMassFromSym(document.getElementById('light').value, 2); - beamMass = beam[2]; + beamMass = beam[2]; heavy[0] = beam[0]+target[0]-light[0]; heavy[1] = beam[1]+target[1]-light[1]; GetMassFromAZ(heavy[0], heavy[1]); document.getElementById('heavyName').innerHTML = heavy[3]; + document.getElementById('heavySp').innerHTML = 'Sn: ' + heavy[4] + ' MeV, Sp: ' + heavy[5] + ' MeV, Sa : ' + heavy[6] + ' MeV'; //document.getElementById('n0').innerHTML = beam[0] + "," + beam[1] + "," + beam[2] //document.getElementById('n1').innerHTML = target[0] + "," + target[1] + "," + target[2] @@ -522,7 +577,7 @@ function CalConstants(){ minKEA = (Math.pow(light[2] + heavy[2],2) - Math.pow(beam[2] + target[2],2))/2/target[2]/beam[0]; document.getElementById('reactionName').innerHTML = reactionName; - document.getElementById('minKEA').innerHTML = minKEA.toFixed(3); + document.getElementById('minKEA').innerHTML = "min Beam Energy: " + minKEA.toFixed(3) + " MeV/u"; document.getElementById('Q-value').innerHTML = Qvalue.toFixed(3); beam_k_lab = Math.sqrt(Math.pow(beam[2] + KE,2) - Math.pow(beam[2],2)); @@ -689,11 +744,12 @@ function PlotEZ(){ xaxis: {range: xRange, title: "Z [mm]", mirror : "allticks", linewidth : "1"}, yaxis: {range: yRange, title: "Energy [MeV]" , mirror : "allticks", linewidth : "1"}, title: reactionName, + margin: { l: 40, r: 40, b : 40, t : 40}, legend: {yanchor:"top", xanchor:"left", x:"0.01",y:"0.99" } }; - Plotly.newPlot( "Plot_EZ", data, layout); + Plotly.newPlot( "Plot_EZ", data, layout, {responsive: true}); PlotThetaCMLine(document.getElementById('thetaCM').value); PlotBore(); @@ -827,10 +883,11 @@ function PlotRZ(){ yaxis: {range: yyy, title: "R [mm]" , mirror : "allticks", linewidth : "1"}, title: reactionName, showlegend : true, - legend: { yanchor:"top", xanchor:"left", x:"0.01",y:"0.99" } + margin: { l: 40, r: 40, b : 40, t : 40}, + legend: { yanchor:"top", xanchor:"left", x:"0.01",y:"0.99"} }; - Plotly.newPlot( "Plot_RZ", data, layout); + Plotly.newPlot( "Plot_RZ", data, layout, {responsive: true}); } diff --git a/index.html b/index.html index 46b390e..e40df25 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,12 @@ -
-
+
- +
- + - + - +
zRange(Min): mm
zRange(Max): mm
rRange: mm
' + (nRow-2) + '