Skip to content

Commit

Permalink
last fixes before release
Browse files Browse the repository at this point in the history
  • Loading branch information
bkatiemills committed Oct 22, 2013
1 parent a340571 commit 582f5bb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
4 changes: 3 additions & 1 deletion efficiencyWidget.css
Original file line number Diff line number Diff line change
Expand Up @@ -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////////////////////////////////////////////////////*/
Expand Down
2 changes: 2 additions & 0 deletions functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ <h1 id='title'>GRIFFIN</h1>

<!--Links///////////////////////////////////////////////////////////-->
<div class='linkWrapper'>
<button id='details' class='standardButton'>Simulation Details</button>
<button id='wikiLink' class='standardButton'>Wiki Help</button>
<button id='yieldDB' class='standardButton'>TRIUMF Yield Database</button>
<button id='ENSDF' class='standardButton'>ENSDF</button>
<button id='BrIcc' class='standardButton'>BrIcc</button>
<button id='details' class='standardButton'>Show Simulation Details</button>
</div>

<!--Graph///////////////////////////////////////////////////////////-->
Expand Down
11 changes: 10 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.<br>LaBr3 Simulation: 8th order polynomial fit above 40 keV.<br>DESCANT: 27% efficient between 1 and 5 MeV, currently 0 elsewhere.<br>SCEPTAR: 80% efficient.<br>SCEPTAR + ZDS: 65% efficient.<br>SCEPTAR + PACES: 40% efficient.<br>PACES + ZDS: 25% efficient.';
detailMessage = 'HPGe GEANT4 Simulation: 8th order polynomial fit including SCEPTAR and Delrin vacuum chamber.<br><br>'
detailMessage +='LaBr3 GEANT4 Simulation: 8th order polynomial fit above 40 keV including SCEPTAR and<br>Delrin vacuum chamber.<br><br>'
detailMessage +='Si(Li) Simulation: Relative Efficiency curve shape based on formalism referenced in<br>Radiation Detection & Measurement (G.F. Knoll, Wiley 2000).<br>'
detailMessage +='An absolute normalization is applied per Masters Thesis of Ryan Dunlop, University of Guelph, 2012,<br>High-precision branching ratio measurement for the superallowed beta+ emitter 74Rb, based on<br>the analysis of in-beam 80Rb decay.<br><br>'
detailMessage +='The following five configuration efficiencies are based on solid angle coverage of detectors:<br>'
detailMessage +='DESCANT: 27% efficient between 1 and 5 MeV; efficiency lower outside this range, and no value is<br>reported here.<br>'
detailMessage +='SCEPTAR: 80% efficient.<br>'
detailMessage +='SCEPTAR + ZDS: 65% efficient.<br>'
detailMessage +='SCEPTAR + PACES: 40% efficient.<br>'
detailMessage +='PACES + ZDS: 25% efficient.';

//call the parameter dump
loadParameters();
Expand Down
11 changes: 5 additions & 6 deletions plumbing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 582f5bb

Please sign in to comment.