diff --git a/efficiencyWidget.css b/efficiencyWidget.css index f5c4e0d..9df26cb 100644 --- a/efficiencyWidget.css +++ b/efficiencyWidget.css @@ -344,8 +344,10 @@ img#pngDump{ background:rgba(0,0,0,0.8); border: 5px solid; border-radius:10px; - top:200px; + top:100px; padding:2em; + max-height: 800px; + overflow:scroll; } /*Footer and footer-related styles////////////////////////////////////////////////////*/ diff --git a/functions.js b/functions.js index 2195953..5f5d56b 100644 --- a/functions.js +++ b/functions.js @@ -10,6 +10,8 @@ function HPGeEfficiency(param, loParam, hiParam, logE){ hiDelta = 0, eff; + if(logE < Math.log(5)) return '0;0;0'; + for(i=0; i<9; i++){ logEff += param[i]*Math.pow(logE,i); //loDelta += Math.pow((param[i] - loParam[i])*Math.pow(logE,i), 2); diff --git a/index.html b/index.html index 65b6d37..b3e1873 100644 --- a/index.html +++ b/index.html @@ -71,11 +71,11 @@

GRIFFIN

diff --git a/main.js b/main.js index 913a2da..1f0caf2 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,16 @@ function setup(){ var HPGeSwitch = document.getElementById('enableHPGe'), LaBr3Switch = document.getElementById('enableLaBr3'), SiLiSwitch = document.getElementById('enableSiLi'), - detailMessage = 'HPGe Simulation: 8th order polynomial fit.
LaBr3 Simulation: 8th order polynomial fit above 40 keV.
DESCANT: 27% efficient between 1 and 5 MeV, currently 0 elsewhere.
SCEPTAR: 80% efficient.
SCEPTAR + ZDS: 65% efficient.
SCEPTAR + PACES: 40% efficient.
PACES + ZDS: 25% efficient.'; + detailMessage = 'HPGe GEANT4 Simulation: 8th order polynomial fit including SCEPTAR and Delrin vacuum chamber.

' + detailMessage +='LaBr3 GEANT4 Simulation: 8th order polynomial fit above 40 keV including SCEPTAR and
Delrin vacuum chamber.

' + detailMessage +='Si(Li) Simulation: Relative Efficiency curve shape based on formalism referenced in
Radiation Detection & Measurement (G.F. Knoll, Wiley 2000).
' + detailMessage +='An absolute normalization is applied per Masters Thesis of Ryan Dunlop, University of Guelph, 2012,
High-precision branching ratio measurement for the superallowed beta+ emitter 74Rb, based on
the analysis of in-beam 80Rb decay.

' + detailMessage +='The following five configuration efficiencies are based on solid angle coverage of detectors:
' + detailMessage +='DESCANT: 27% efficient between 1 and 5 MeV; efficiency lower outside this range, and no value is
reported here.
' + detailMessage +='SCEPTAR: 80% efficient.
' + detailMessage +='SCEPTAR + ZDS: 65% efficient.
' + detailMessage +='SCEPTAR + PACES: 40% efficient.
' + detailMessage +='PACES + ZDS: 25% efficient.'; //call the parameter dump loadParameters(); diff --git a/plumbing.js b/plumbing.js index 76ffa89..850f095 100644 --- a/plumbing.js +++ b/plumbing.js @@ -266,16 +266,15 @@ function confirm(headline, detailText){ 'innerHTML' : headline }) - //fix dimensions - var width = 0.35*window.innerWidth; - document.getElementById('dialogHeader').setAttribute('width', width); + //warning text + injectDOM('p', 'warning', 'tempDiv', {'style':'padding: 1em; font-size:120%; line-height:1.5; text-align:left', 'innerHTML':detailText}); + + //center dialogue + var width = document.getElementById('tempDiv').offsetWidth; document.getElementById('tempDiv').style.left = document.body.offsetWidth/2 - width/2; - //warning text - injectDOM('p', 'warning', 'tempDiv', {'style':'padding: 1em; font-size:120%; line-height:1.5; text-align:left', 'innerHTML':detailText}); - //insert submit & abort button injectDOM('input', 'abortChoice', 'tempDiv', { 'class' : 'standardButton',