From 15e3c2e294e4192535dec85fb92b8ef32199fa64 Mon Sep 17 00:00:00 2001 From: "Ryan@fsunuc" Date: Thu, 15 Dec 2022 13:26:17 -0500 Subject: [PATCH] some bugs fixed, and added ISS and CERN logo --- CERN_logo.svg | 1 + ISS_logo.png | Bin 0 -> 5675 bytes heliosmatics.html | 186 +++++++++++++++++++++++++++++++--------------- 3 files changed, 128 insertions(+), 59 deletions(-) create mode 100644 CERN_logo.svg create mode 100644 ISS_logo.png 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 0000000000000000000000000000000000000000..2dad6e8ded20626fd6474217482fe29563cd8fff GIT binary patch literal 5675 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 R%ZmU2002ovPDHLkV1i%e{#XD2 literal 0 HcmV?d00001 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);