some bugs fixed, and added ISS and CERN logo

CERN_logo.svg

@@ -0,0 +1 @@
+<svg height="316.227766" viewBox="0 0 14.41662 14.41666" width="316.227766" xmlns="http://www.w3.org/2000/svg"><path d="m171.53706 206.16631c0-.26917-.2353-.35454-.41945-.35454-.12453 0-.20567.008-.26247.0134-.008.19756-.0162.37924-.0162.57433v.14887c.0268.004.15346.003.18133.002.22331-.005.51682-.0759.51682-.38453m4.66831-.97296c.50271.61665.91016 1.59279.96943 2.40947h.008l.4191-4.32823h.23636s-.26811 2.79788-.4244 4.18818c-.19543 1.74131-.44379 2.46415-.91898 3.22474l-.0727-.33126c.37006-.65017.47589-1.21779.52387-1.51659.15064-.93098-.0646-2.20169-.71332-3.19334-.72672-1.11125-2.026-1.92864-3.62091-1.92864-1.31021 0-2.44863.57573-3.24308 1.47426l-.19262-.1524c.84102-.95462 2.0634-1.56351 3.4357-1.56351 1.43898 0 2.72027.64664 3.5934 1.71732m-2.32798 2.39748-.0885-.00071c-.10866-.14675-1.24425-1.33138-1.34267-1.43616-.002.10019-.003.30833-.003.51082 0 .26882.0205.6791.0324.901-.0275-.005-.0681-.01-.11536-.01-.048 0-.0871.004-.11853.01.0222-.2861.0282-.75036.0282-1.1871 0-.34078-.005-.52775-.009-.69991l.0885.001c.11465.12453 1.24389 1.29293 1.34232 1.3977.002-.0998.003-.27657.003-.47907 0-.26881-.0205-.67945-.0324-.90099.0275.005.0681.01.11535.01.048 0 .0871-.004.11889-.01-.0226.2861-.0286.75036-.0286 1.1871 0 .34078.005.5341.009.70626m-2.04858-.0342c-.0247 0-.11818.001-.16969.009-.10689-.16298-.44944-.67663-.68262-.91616-.007 0-.13759 0-.13759 0v.21519c0 .23283.0106.46814.0215.70097-.0459-.008-.12911-.009-.14605-.009-.0173 0-.10054.001-.1464.009.0109-.23283.0215-.46814.0215-.70097v-.46531c0-.23284-.0106-.46849-.0215-.70097.10301.008.23283.0134.33584.0134.10302 0 .20567-.0134.30833-.0134.30586 0 .58632.0903.58632.43074 0 .36018-.35913.49001-.5648.51682.13265.1651.60748.74365.76447.91969-.054-.008-.14464-.009-.16933-.009m-1.58962.009c-.097-.005-.23213-.009-.36019-.0113-.0737-.001-.14569-.002-.20214-.002h-.024c-.1651 0-.41839.005-.58349.0134.0109-.23566.0219-.47096.0219-.70379v-.46532c0-.23283-.0109-.46813-.0219-.69814.16228.008.4131.0134.57538.0134s.46531-.007.55915-.0134c-.004.0254-.007.0554-.007.0921 0 .037.004.0751.007.0935-.1785-.0134-.49671-.0353-.84843-.0353-.003.11642-.008.60995-.008.67769.31926 0 .52387-.0138.68368-.0268-.005.0268-.008.0755-.008.10231 0 .0272.003.0674.008.0945-.18662-.019-.60466-.0247-.68368-.0247-.005.0907-.00071.67628.003.72566.19791-.003.70485-.0183.88935-.0353-.003.0205-.006.0628-.006.10407 0 .0409.002.0709.006.0995m-1.73037 2.69028c-.32244-.65581-.46885-1.32186-.48825-1.95897.0822 0 .1771.003.25894.003.0286.60996.16651 1.36772.64347 2.19146-.17216-.0631-.30163-.14676-.41416-.23566m-1.43263-3.62479c0-.58173.43991-.96908 1.03822-.96908.23283 0 .49918.072.6477.13547-.031.0688-.0564.15981-.0674.2166l-.0162.006c-.115-.12736-.29986-.23777-.57361-.23777-.34749 0-.74719.28116-.74719.84208 0 .5461.40746.83608.77153.83608.32737 0 .48366-.1524.62441-.27129l.0109.0109-.0399.21202c-.0646.0487-.28822.18803-.62442.18803-.60925 0-1.02411-.38382-1.02411-.96873m4.8461-4.27002c.7112.19967 1.3776.56515 1.90747 1.05904-.15275-.0406-.30868-.0737-.46708-.0984-.74506-.58878-1.71485-.94015-2.72803-.94015-2.39395 0-4.35327 1.95227-4.35327 4.35187 0 2.39959 1.95227 4.35151 4.35186 4.35151 2.3996 0 4.35152-1.95192 4.35152-4.35151 0-.92816-.34961-1.85561-.82974-2.51072.11466.0346.25436.0935.41522.18873.32491.49283.62654 1.29752.88477 2.53189.27093 1.29505 1.66476 7.49794 1.81539 8.16822h1.68734v-12.71341l-7.03545-.0434zm-2.32022 9.05439c.34537.29881.89218.67487 1.56845.91793-.0564.0603-.11782.12559-.18309.19473-.67557-.26705-1.33632-.68192-1.84961-1.24036.14428.0487.30339.0928.46425.1277m-5.06095-10.72056v14.41662h4.30248l4.25627-4.52614-.006-.005c-.68439.4826-1.55293.74471-2.4892.74471-1.73532 0-3.26461-1.02941-3.92783-2.3107l-.007.005.90276 3.04624h-.24448s-.44803-1.54376-.83044-2.88925c-.28928-1.01847-.46778-1.77306-.46531-2.44264.008-2.30328 1.81892-4.41501 4.22769-4.57094.066-.005.27093-.0258.57608-.0261 1.85526-.001 7.57203.0427 8.1213.0469v-1.48802zm11.37956 10.37802.0649.29492c-.77823.84067-1.96956 1.47073-3.35668 1.47073-.29704 0-.60713-.0289-.95215-.10195.0702-.0744.13723-.14605.20038-.21308.22154.0392.47625.0653.73766.0653 1.34902.00071 2.52765-.60642 3.30588-1.51588m-.72285-4.21147c.0219 1.27142-.56056 2.13466-.744 2.43382-.15981.26105-.54187.76412-1.27706 1.54481-.92745.98496-3.82623 4.06612-4.01955 4.27144h7.86095l-1.81257-8.25077z" fill="#1e59ae" transform="translate(-164.54114 -200.69462)"/></svg>

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%;
+    }
+  }
 </style>
 
 <body bgcolor="#6DB33E">
@@ -23,18 +37,18 @@
 <table>
  <tr>
   <td style="text-align:right"> Beam (A):</td>
-  <td><Input type="text" size="3" value="24F" id="beam"/></td> 
+  <td><Input type="text" style="width:60px" value="24F" id="beam" enterkeyhint="done"/></td> 
   <td style="text-align:right"> Beam Ex:</td>
-  <td><Input type="text" size="3" value="0" id="beamEx"/></td>
+  <td><Input type="text" style="width:60px" value="0" id="beamEx" enterkeyhint="done"/></td>
   <td>MeV</td>
  </tr>
  <tr>
   <td style="text-align:right"> Target (a):</td>
-  <td><Input type="text" size="3" value="d" id="target"/></td> 
+  <td><Input type="text" style="width:60px" value="d" id="target" enterkeyhint="done"/></td> 
  </tr>
  <tr>
   <td style="text-align:right"> Light (b):</td>
-  <td><Input type="text" size="3" value="p" id="light"/></td> 
+  <td><Input type="text" style="width:60px" value="p" id="light" enterkeyhint="done"/></td> 
   <td style="text-align:right"> Q-value:</td>
   <td id='Q-value'>2.057</td>
   <td>MeV</td>
@@ -65,14 +79,14 @@
 <table>
  <tr>
   <td style="text-align:right"> B-field:</td>
-  <td><Input type="text" size="3" value="-2" id='BField'/></td> 
+  <td><Input type="text"  style="width:60px" value="-2" id='BField' enterkeyhint="done"/></td> 
   <td>T</td>
   <td><Input type="range" min="-4" max="4" step="0.05" value="-2" style="width:400px" id='BRange'/> </td>
  </tr>
 
  <tr>
   <td style="text-align:right"> Beam Energy:</td>
-  <td><Input type="text" size="3" value="10" id='KEA'/></td>
+  <td><Input type="text" style="width:60px" value="10" id='KEA' enterkeyhint="done"/></td>
   <td>MeV/u</td>
   <td><Input type="range" min="0" max="20" step="0.1" value="10" style="width:400px" id='KEARange'/> </td>
  </tr>
@@ -101,8 +115,8 @@
     <th style="width:70px">2&rho;<sub>B</sub>[mm]</th>
   </tr>
   </tr>
-   <td><input type="text" id='Ex1' name="Ex" size="8" value="0"/></td>
+   <td><input type="text" id='Ex1' name="Ex" size="8" value="0" enterkeyhint="done"/></td>
-   <td><input type="text" id='theta1' name="thetaCM" size="8" value="10"/></td>
+   <td><input type="text" id='theta1' name="thetaCM" size="8" value="10" enterkeyhint="done"/></td>
    <td></td>
    <td></td>
    <td></td>
@@ -115,8 +129,8 @@
    <td></td>
   </tr>
   </tr>
-   <td><input type="text" id='Ex2' name="Ex" size="8" value="0"/></td>
+   <td><input type="text" id='Ex2' name="Ex" size="8" value="0" enterkeyhint="done"/></td>
-   <td><input type="text" id='theta2' name="thetaCM" size="8" value="40"/></td>
+   <td><input type="text" id='theta2' name="thetaCM" size="8" value="40" enterkeyhint="done"/></td>
    <td></td>
    <td></td>
    <td></td>
@@ -139,18 +153,18 @@
 <table>
  <tr>
   <td style="text-align:right"> &theta;<sub>CM</sub>:</td>
-  <td><Input type="text" size="4" value="0" id='thetaCM'/></td> 
+  <td><Input type="text" style="width:60px" value="0" id='thetaCM' enterkeyhint="done"/></td> 
   <td>deg</td>
   <td><Input type="range" min="0" max="50" step="0.1" value="0" style="width:600px" id='thetaCMRange'/> </td>
  </tr>
  <td style="text-align:right"> Array Pos:</td>
-  <td><Input type="text" size="4" value="-100" id='posArray'/></td> 
+  <td><Input type="text" style="width:60px" value="-100" id='posArray' enterkeyhint="done"/></td> 
   <td>mm</td>
   <td><Input type="range" min="-500" max="1000" step="1" value="-100" style="width:600px" id='posArrayRange'/> </td>
  </tr>
  <tr>
   <td style="text-align:right"> Recoil Pos:</td>
-  <td><Input type="text" size="4" value="1500" id='posRecoil'/></td> 
+  <td><Input type="text" style="width:60px" value="1500" id='posRecoil' enterkeyhint="done"/></td> 
   <td>mm</td>
   <td><Input type="range" min="0" max="2000" step="1" value="1500" style="width:600px" id='posRecoilRange'/> </td>
  </tr>
@@ -158,41 +172,63 @@
 
 <p></p>
 
-<table cellspacing="0" cellpadding="0">
+
+<div class="row">
+ <div class="column">
+  <table cellspacing="0" cellpadding="0">
+    <tr>
+      <td>
+      <div id="Plot_EZ" style="width:650px;height:600px;"></div>
+      </td>
+    </tr>
+    <tr>
+     <td>
+      <table style="float : center; padding-left: 70px">
+        <tr> 
+          <td>eRange:</td>
+          <td><Input type="text" style="width:60px" value="12" id='eRange' enterkeyhint="done"/></td>
+          <td>MeV</td>
+          <td><Input type="range" min="1" max="30" step="0.1" value="12" style="width:300px" id='eRangeSlider'/></td>
+        </tr>
+       </table>
+     </td>
+    </tr>
+  </table>
+ </div>
+ <div class="column">
+ <table cellspacing="0" cellpadding="0">
+  <tr>
+    <td>
+      <div id="Plot_RZ" style="width:650px;height:600px;"></div>
+    </td>
+  </tr>
   <tr>
-   <td></td>
    <td> 
      <table style="float : center; padding-left: 70px">
       <tr> 
         <td>zRange(Min):</td>
-        <td><Input type="text" size="4" value="-200" id='zRange1'/></td>
+        <td><Input type="text" style="width:60px" value="-200" id='zRange1' enterkeyhint="done"/></td>
         <td>mm</td>
         <td><Input type="range" min="-2000" max="4000" step="1" value="-200" style="width:300px" id='zRange1Slider'/></td>
       </tr>
       <tr> 
         <td>zRange(Max):</td>
-        <td><Input type="text" size="4" value="2000" id='zRange2'/></td>
+        <td><Input type="text" style="width:60px" value="2000" id='zRange2' enterkeyhint="done"/></td>
         <td>mm</td>
         <td><Input type="range" min="-2000" max="4000" step="1" value="2000" style="width:300px" id='zRange2Slider'/></td>
       </tr>
       <tr> 
         <td>rRange:</td>
-        <td><Input type="text" size="4" value="50" id='rRange'/></td>
+        <td><Input type="text" style="width:60px" value="50" id='rRange' enterkeyhint="done"/></td>
         <td>mm</td>
         <td><Input type="range" min="1" max="400" step="1" value="50" style="width:300px" id='rRangeSlider'/></td>
       </tr>
-     </table
+     </table>
   </td>
-  
+
-  <tr>
-    <td>
-      <div id="Plot_EZ" style="width:650px;height:600px;"></div>
-    </td>
-    <td>
-      <div id="Plot_RZ" style="width:650px;height:600px;"></div>
-    </td>
-  </tr>
 </table>
+ </div>
+</div>
 
 <p id="n0"></p>
 <p id="n1"></p>
@@ -213,8 +249,8 @@
     </tr>
     </tr>
      <td id='dwba1'>0</td>
-     <td><input type="text" name="Jpi" size="5" value="3/2+"/></td>
+     <td><input type="text" name="Jpi" size="5" value="3/2+" enterkeyhint="done"/></td>
-     <td><input type="text" name="Orb" size="5" value="0d3/2"/></td>
+     <td><input type="text" name="Orb" size="5" value="0d3/2" enterkeyhint="done"/></td>
     </tr>
   </table>
 
@@ -291,11 +327,15 @@
 <hr style="height:4px;background-color:#F7CF3C; border-style:none; border-width:none">
 <h4>This page is created and hosted by Fox's Lab (FSU) in collabortion with SOLARIS (FRIB).</h4>
 <h4>The SOLARIS project is based on HELIOS (ANL) and is leaded by ANL.</h4>
+<h4>The ISS (ISOLDE Solenoidal Spectrometer) is located as CERN.</h4>
+
 <a href="https://fsunuc.physics.fsu.edu" target="_blank"><img src="FSU_logo_640.png" width="150"></a>
 <a href="https://www.anl.gov/phy/solaris" target="_blank"><img src="SOLARIS_logo.png" height="150"></a>
 <a href="https://fribs.msu.edu/news/2021/solaris.html" target="_blank"><img src="FRIB_logo.jpg" height="150"></a>
 <a href="https://www.anl.gov/phy/helical-orbit-spectrometer" target="_blank"><img src="HELIOS_logo.jpg" height="150"></a>
 <a href="https://www.anl.gov/phy" target="_blank"><img src="ANL_logo.gif" height="150"></a>
+<a href="https://isolde-solenoidal-spectrometer.web.cern.ch/" target="_blank"><img src="ISS_logo.png" height="150"></a>
+<a href="https://home.cern/science/experiments/isolde" target="_blank"><img src="CERN_logo.svg" height="150"></a>
 <p></p>
 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 = '<td><input type="text" name="Ex" size="8" value=\"' + (nRow-2) + '\" id=\"Ex' + (nRow-1) + '\"/></td> \
+  row.innerHTML = '<td><input type="text" name="Ex" size="8" value=\"' + (nRow-2) + '\" id=\"Ex' + (nRow-1) + '\ enterkeyhint=\"done\""/></td> \
-                   <td><input type="text" name="thetaCM" size="8" value=\"10\" id=\"theta' + (nRow-1) + '\"/></td> \
+                   <td><input type="text" name="thetaCM" size="8" value=\"10\" id=\"theta' + (nRow-1) + '\ enterkeyhint=\"done\""/></td> \
                    <td></td> \
                    <td></td> \
                    <td></td> \
@@ -324,7 +364,6 @@ function addRow() {
                    <td></td>';
   CalculateEZ();
   CalculateRZ();
-  AdjustRangeEZ(document.getElementById('posArray').value);
 }
 
 function deleteRow(){
@@ -610,18 +649,12 @@ function CalculateEZ(){
     
   };
   
-  let haha = parseFloat(document.getElementById('posArrayRange').value);
+  PlotEZ();
-  let xStart = (haha < 0 ? haha - arrayLen - 100 : haha - 100);
+  AdjustRangeEZ();
-  let xEnd = (haha < 0 ? haha + 100: haha + arrayLen + 100);
-  
-  xRange = [xStart, xEnd];
-  //document.getElementById('n0').innerHTML = xRange;
-  
-  PlotEZ(xRange, yRange);
   
 }
 
-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"},
+    xaxis: {range: xRange, title: "Z [mm]", mirror : "allticks", linewidth : "1"},
-    yaxis: {range: rangeY, title: "Energy [MeV]" , 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){
+function AdjustRangeEZ(){
-  let haha = parseFloat(value);
+  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);