diff --git a/get_nuclear_data.py b/get_nuclear_data.py index 895caaa..4a71fe4 100644 --- a/get_nuclear_data.py +++ b/get_nuclear_data.py @@ -47,8 +47,8 @@ try : print("
A : %3d, Z : %3d, N : %3d" % (Z+N, Z, N)) print("
Jpi : %3s" % (temp['jp'][0])) - if halfLife != " " : - print(", half-live : %s sec" % (halfLife)) + #if halfLife != " " : + print("
half-live : %s sec" % (halfLife)) print("
Mass : %.4f MeV" % (mass)) print("
Binding : %.4f MeV/A" % (temp['binding']/1000)) print("
Binding : %.4f MeV" % (temp['binding']/1000*(Z+N))) @@ -87,7 +87,7 @@ if float(maxEx) > 0 : print("") for i in range(0, l+1): if float(ex[i]) < float(maxEx)*1000: - print("" % (ex[i], jp[i])) + print("" % (ex[i], jp[i].replace(' ', ','))) else: break print("
%9.3f %s
%9.3f %s
") diff --git a/heliosmatics.html b/heliosmatics.html index 8dbbcf8..93e2991 100644 --- a/heliosmatics.html +++ b/heliosmatics.html @@ -3,6 +3,7 @@ Heliosmatics + @@ -438,12 +439,12 @@ function CopyInputs(){ if( inputs[i].type == 'text'){ //console.log(inputs[i].id.substring(0,2)); if( inputs[i].id.substring(0,2) == 'Ex' || inputs[i].id.substring(0,5) == 'theta' ) { - continue; + continue; } if( inputs[i].id == 'innerRecoil'){ break; } - copyText += inputs[i].value + ", "; + copyText += inputs[i].value + ", "; } } diff --git a/heliosmatics.js b/heliosmatics.js index 7f8faae..f9d41f7 100644 --- a/heliosmatics.js +++ b/heliosmatics.js @@ -191,8 +191,8 @@ function CalConstants(){ KEA = document.getElementById('KEA').value; KE = KEA * beam[0]; - reactionName = beam[3] +"(" + target[3] + "," + light[3] + ")" + heavy[3] + "@" + KEA + "MeV/u"; - + reactionName = beam[3] +"(" + target[3] + "," + light[3] + ")" + heavy[3] + "@" + KEA + "MeV/u, " + BField.toFixed(1) + " T"; + Qvalue = - heavy[2] - light[2] + beam[2] + target[2] ; minKEA = (Math.pow(light[2] + heavy[2],2) - Math.pow(beam[2] + target[2],2))/2/target[2]/beam[0]; diff --git a/simpleInput.py b/simpleInput.py index 63e3a04..a191114 100755 --- a/simpleInput.py +++ b/simpleInput.py @@ -237,6 +237,10 @@ pngName=haha.splitlines().pop() print ("Content-Type: text/html\r\n\r\n") print ("") +print ("") +print ("Result of DWBA and Monte Carlo Simulation") +print ("") +print ("") print ("") print ("") #print ("") diff --git a/simpleSim.html b/simpleSim.html index be18377..17e5c7d 100644 --- a/simpleSim.html +++ b/simpleSim.html @@ -2,6 +2,8 @@ + DWBA and Monte Carlo Simulation +