add better labelling of internals/externals

- use clearer notation for isotope-specific projectiles
- harmonize formatting of GUI labels (consistent naming, add missing units, fix typos, etc.)
- use more verbose/descriptive naming of the function/dictionary handelling the electronic stopping coefficients (for easier extension later).
This commit is contained in:
2022-12-27 17:06:52 -04:00
parent 644d0479d8
commit 4683945a71
2 changed files with 29 additions and 29 deletions

View File

@@ -24,7 +24,7 @@
<button class="tablinks" onclick="openTab(event,'Layers')" id="btnLayers">Layers</button>
<button class="tablinks" onclick="openTab(event,'Scans')" id="btnScans">Scans</button>
<button class="tablinks" onclick="openTab(event,'Plots')" id="btnPlots">Plots</button>
<button class="tablinks" onclick="openTab(event,'Other')" id="btnOther">Other Params</button>
<button class="tablinks" onclick="openTab(event,'Other')" id="btnOther">Other Parameters</button>
</div>
<div id="Layers" class="tabcontent">
<table style="width: 100%;">
@@ -51,7 +51,7 @@
</tr>
<tr><td colspan="2">
<table id="LTable" border="2" cellpadding="10">
<tr><td><b>Layer #</b></td><td><b>Composition</b></td><td><b>Density [g/cm<sup>3</sup>]</b></td><td><b>Thickness [A]</b></td></tr>
<tr><td><b>Layer #</b></td><td><b>Composition</b></td><td><b>Density [g/cm<sup>3</sup>]</b></td><td><b>Thickness [Å]</b></td></tr>
</table>
</td></tr>
</table>
@@ -61,10 +61,10 @@
<tr><td collspan="2"><b>Projectile parameters</b></td></tr>
<tr><td>Projectile</td>
<td><select name="ProjType" id="ProjType" onchange="ProjSmartDefaults()" onload="ProjSmartDefaults()">
<option selected="selected" value="Muon">Muon</option>
<option value="Li8">Li8</option>
<option value="B12">B12</option>
<option value="Mg31">Mg31</option>
<option selected="selected" value="muon">muon</option>
<option value="lithium-8">lithium-8</option>
<option value="boron-12">boron-12</option>
<option value="magnesium-31">magnesium-31</option>
<option value="H">H</option>
</select>
</td>
@@ -72,8 +72,8 @@
<tr><td>Number of projectiles</td>
<td><input name="numberProj" id="numberProj" type="text" size="7" value="1000" onchange="//ProjNumberLimit()"></td>
</tr>
<tr><td>Starting depth [A]</td><td><input name="z0" id="z0" type="text" size="7" value="0"></td></tr>
<tr><td>Depth increment [A]</td><td><input name="dz" id="dz" type="text" size="7" value="20"></td></tr>
<tr><td>Starting depth [Å]</td><td><input name="z0" id="z0" type="text" size="7" value="0"></td></tr>
<tr><td>Depth increment [Å]</td><td><input name="dz" id="dz" type="text" size="7" value="20"></td></tr>
<tr><td>Energy [eV]</td><td><input name="valEnergy" id="valEnergy" type="text" size="7" value="2000"></td></tr>
<tr><td>Energy sigma [eV]</td><td><input name="sigEnergy" id="sigEnergy" type="text" size="7" value="450"></td></tr>
<tr><td>Angle [deg]</td><td><input name="valAngle" id="valAngle" type="text" size="7" value="0"></td></tr>
@@ -89,22 +89,22 @@
<input type="checkbox" name="scanSeq" id="scanSeq" onChange="adjust_scans();"> Enable scan on
<select name="scanType" id="scanType" onchange="adjust_scans();">
<option value="scanLoop">Loop</option>
<option value="scanVals">Set of Values</option>
<option value="scanVals">Set of values</option>
</select>
<div id="ScansLine" style="visibility: hidden;">
<br>Set of Values: <input name="scanList" id="scanList" type="text" value="1000">
corresponding depth increment <input name="scanListdz" id="scanListdz" type="text" value="">
<br>Set of values: <input name="scanList" id="scanList" type="text" value="1000">
Corresponding depth increment: <input name="scanListdz" id="scanListdz" type="text" value="">
</div>
<table id="ScansTable" style="width: 100%;visibility: hidden;">
<tr>
<td colspan="3">Scan parameter
<select name="comboScan" id="comboScan" onchange="">
<option value="EScan">Energy</option>
<option value="SigEScan">Energy Sigma</option>
<option value="AngleScan">Angle</option>
<option value="SigAngleScan">Angle Sigma</option>
<option value="NProjScan">Number of Projectiles</option>
<option value="dScan">Thickness of layer1</option>
<option value="EScan">Energy [eV]</option>
<option value="SigEScan">Energy sigma [eV]</option>
<option value="AngleScan">Angle [deg]</option>
<option value="SigAngleScan">Angle sigma [deg]</option>
<option value="NProjScan">Number of projectiles</option>
<option value="dScan">Thickness of layer # 1</option>
</select>
</td>
</tr>

View File

@@ -38,10 +38,10 @@ function parse_formula (mf) {
function Zof(Element)
{
var ElementsZ = {
"Muon":1,
"Li8":3,
"B12":5,
"Mg31":12,
"muon":1,
"lithium-8":3,
"boron-12":5,
"magnesium-31":12,
"H":1,
"He":2,
"Li":3,
@@ -142,10 +142,10 @@ function Zof(Element)
function Massof(Element)
{
var ElementsA = {
"Muon":0.1134289259,
"Li8":8.02248624,
"B12":12.0143526,
"Mg31":30.996648,
"muon":0.1134289259,
"lithium-8":8.02248624,
"boron-12":12.0143526,
"magnesium-31":30.996648,
"H":1.00800,
"He":4.00300,
"Li":6.93900,
@@ -342,9 +342,9 @@ function Elastof(Element) {
return Elast[Element];
}
function Stopicru(Element)
function StoppingCoefficients(Element)
{
var Stopicru = {
var StoppingCoefficientsICRU = {
"H":"1.25400,1.44000,242.60001,12000.00000,0.11590",
"He":"1.22900,1.39700,484.50000,5873.00000,0.05225",
"Li":"1.41100,1.60000,725.59998,3013.00000,0.04578",
@@ -439,7 +439,7 @@ function Stopicru(Element)
"U":"7.29000,8.20400,19180.00000,586.29999,0.00267",
"":"0.00000,0.00000,0.00000,0.00000,0.00000"
};
return Stopicru[Element];
return StoppingCoefficientsICRU[Element];
}
@@ -891,7 +891,7 @@ function CreateInpFile(All) {
All[LEkey+"E"+NEl]=ElE; // sprintf("%8.4f",$ElE);
All["L"+i+"030"+NEl]=El030; // sprintf("%8.4f",$El030);
let ElST = Stopicru(El);
let ElST = StoppingCoefficients(El);
let ElSTs = ElST.split(',');
let j=1;
for (let iElST of ElSTs) {