diff --git a/CERN_logo.svg b/CERN_logo.svg new file mode 100644 index 0000000..02a64f0 --- /dev/null +++ b/CERN_logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ISS_logo.png b/ISS_logo.png new file mode 100644 index 0000000..2dad6e8 Binary files /dev/null and b/ISS_logo.png differ diff --git a/heliosmatics.html b/heliosmatics.html index 2499bbc..d861df7 100644 --- a/heliosmatics.html +++ b/heliosmatics.html @@ -9,7 +9,21 @@ body{ font-family: Arial, Helvetica, sans-serif; } - + .column{ + float : left; + width: 50%; + padding: 0px; + } + .row:after { + content: ""; + display: table; + clear: both; + } + @media screen and (max-width: 1200px) { + .column { + width: 100%; + } + } @@ -23,18 +37,18 @@ - + - + - + - + @@ -65,14 +79,14 @@
Beam (A): Beam Ex: MeV
Target (a):
Light (b): Q-value: 2.057 MeV
- + - + @@ -101,8 +115,8 @@ - - + + @@ -115,8 +129,8 @@ - - + + @@ -139,18 +153,18 @@
B-field: T
Beam Energy: MeV/u
2ρB[mm]
- + - + - + @@ -158,41 +172,63 @@

-
θCM: deg
Array Pos: mm
Recoil Pos: mm
+ +
+
+
+ + + + + + +
+
+
+ + + + + + + +
eRange:MeV
+
+ +
+ + + + - - - - - - +
+
+
- + - + - + -
zRange(Min): mm
zRange(Max): mm
rRange: mm
-
- 		-
-
+
+

@@ -213,8 +249,8 @@ 0 - - + + @@ -291,11 +327,15 @@

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) @@ -310,8 +350,8 @@ function addRow() { let table = document.getElementById("ExTable"); let nRow = table.rows.length; let row = table.insertRow(nRow-1); - row.innerHTML = ' \ - \ + row.innerHTML = ' \ + \ \ \ \ @@ -324,7 +364,6 @@ function addRow() { '; CalculateEZ(); CalculateRZ(); - AdjustRangeEZ(document.getElementById('posArray').value); } function deleteRow(){ @@ -610,18 +649,12 @@ function CalculateEZ(){ }; - let haha = parseFloat(document.getElementById('posArrayRange').value); - let xStart = (haha < 0 ? haha - arrayLen - 100 : haha - 100); - let xEnd = (haha < 0 ? haha + 100: haha + arrayLen + 100); - - xRange = [xStart, xEnd]; - //document.getElementById('n0').innerHTML = xRange; - - PlotEZ(xRange, yRange); + PlotEZ(); + AdjustRangeEZ(); } -function PlotEZ(rangeX, rangeY){ +function PlotEZ(){ SetSSType(); Plotly.purge("Plot_EZ"); @@ -641,21 +674,30 @@ function PlotEZ(rangeX, rangeY){ } data.push(newData); } + + let haha = parseFloat(document.getElementById('posArrayRange').value); + let xStart = (haha < 0 ? haha - arrayLen - 100 : haha - 100); + let xEnd = (haha < 0 ? haha + 100: haha + arrayLen + 100); + + xRange = [xStart, xEnd]; + //document.getElementById('n0').innerHTML = xRange; + + let haha2 = parseFloat(document.getElementById('eRangeSlider').value); + yRange = [0, haha2]; let layout = { - xaxis: {range: rangeX, title: "Z [mm]", mirror : "allticks", linewidth : "1"}, - yaxis: {range: rangeY, title: "Energy [MeV]" , mirror : "allticks", linewidth : "1"}, + xaxis: {range: xRange, title: "Z [mm]", mirror : "allticks", linewidth : "1"}, + yaxis: {range: yRange, title: "Energy [MeV]" , mirror : "allticks", linewidth : "1"}, title: reactionName, legend: {yanchor:"top", xanchor:"left", x:"0.01",y:"0.99" } }; + Plotly.newPlot( "Plot_EZ", data, layout); - PlotThetaCMLine(document.getElementById('thetaCM').value); PlotBore(); - - AdjustRangeEZ(-100); + PlotRZ(); } @@ -675,7 +717,13 @@ function PlotThetaCMLine(thetaCM){ eList.push(haha); } - Plotly.addTraces("Plot_EZ", {x : zzList, y: eList, name:"thetaCM=" + thetaCM , marker : { color : 'rgb(100,100,100)'}}, 0); + Plotly.addTraces("Plot_EZ", {x : zzList, + y: eList, + name:"thetaCM=" + thetaCM , + marker : { color : 'rgb(100,100,100)'}, + line : {dash : 'solid', width : 1 } + } + , 0); } function PlotBore(){ @@ -823,12 +871,12 @@ document.getElementById('light').addEventListener('keypress', document.getElementById('BField').addEventListener('keypress', function(e){ + //document.getElementById('n0').innerHTML = e.keyCode; if(e.keyCode == 13){ document.getElementById('BRange').value = this.value; CalConstants(); CalculateEZ(); CalculateRZ(); - AdjustRangeEZ(document.getElementById('posArray').value); } }, false ); @@ -838,7 +886,7 @@ document.getElementById('BRange').oninput = function(){ CalConstants(); CalculateEZ(); CalculateRZ(); - AdjustRangeEZ(document.getElementById('posArray').value); + AdjustRangeEZ(); } document.getElementById('KEA').addEventListener('keypress', @@ -848,7 +896,6 @@ document.getElementById('KEA').addEventListener('keypress', CalConstants(); CalculateEZ(); CalculateRZ(); - AdjustRangeEZ(document.getElementById('posArray').value); } }, false ); @@ -858,7 +905,6 @@ document.getElementById('KEARange').oninput = function(){ CalConstants(); CalculateEZ(); CalculateRZ(); - AdjustRangeEZ(document.getElementById('posArray').value); } document.getElementById('thetaCM').addEventListener('keypress', @@ -868,7 +914,6 @@ document.getElementById('thetaCM').addEventListener('keypress', CalConstants(); CalculateEZ(); CalculateRZ() - AdjustRangeEZ(document.getElementById('posArray').value); } }, false ); @@ -878,17 +923,20 @@ document.getElementById('thetaCMRange').oninput = function(){ CalConstants(); CalculateEZ(); CalculateRZ() - AdjustRangeEZ(document.getElementById('posArray').value); } -function AdjustRangeEZ(value){ - let haha = parseFloat(value); +function AdjustRangeEZ(){ + let haha = parseFloat(document.getElementById('posArray').value); let xStart = (haha < 0 ? haha - arrayLen - 100 : haha - 100); let xEnd = (haha < 0 ? haha + 100: haha + arrayLen + 100); xRange = [xStart, xEnd]; + let haha2 = parseFloat(document.getElementById('eRangeSlider').value); + + yRange = [0, haha2]; + let pos = []; for( let i = 0; i < nDet; i++){ let kaka = []; @@ -934,7 +982,7 @@ document.getElementById('posArray').addEventListener('keypress', function(e){ if(e.keyCode == 13){ document.getElementById('posArrayRange').value = this.value; - AdjustRangeEZ(this.value); + AdjustRangeEZ(); AdjustRecoilPos(); } }, false @@ -942,7 +990,7 @@ document.getElementById('posArray').addEventListener('keypress', document.getElementById('posArrayRange').oninput = function(){ document.getElementById('posArray').value = this.value; - AdjustRangeEZ(this.value); + AdjustRangeEZ(); AdjustRecoilPos(); } @@ -1078,11 +1126,31 @@ document.getElementById('rRangeSlider').oninput = function(){ AdjustRangeRZ(); } +document.getElementById('eRange').addEventListener('keypress', + function(e){ + if(e.keyCode == 13){ + let rrrr = parseInt(this.value); + if ( rrrr < 1 ){ + document.getElementById('eRange').value = 1; + rrrr = 1; + } + document.getElementById('eRangeSlider').value = rrrr; + AdjustRangeEZ(); + } + }, false +); + +document.getElementById('eRangeSlider').oninput = function(){ + document.getElementById('eRange').value = this.value; + AdjustRangeEZ(); +} + window.logMeThis = function(){ SetSSType(); CalculateEZ(); CalculateRZ(); } + var FuncEx = window.logMeThis.bind(null, "Ex"); window.addEventListener('keypress', FuncEx);