diff --git a/digios b/digios
index a0b335d..cee50c2 160000
--- a/digios
+++ b/digios
@@ -1 +1 @@
-Subproject commit a0b335d61fc9ad7fda81c21ba11bcc79aac7bfc4
+Subproject commit cee50c25d6c615a142ae46a705f8fa9117ef2714
diff --git a/simpleInput.py b/simpleInput.py
index a191114..b7d3b91 100755
--- a/simpleInput.py
+++ b/simpleInput.py
@@ -209,11 +209,20 @@ result=""
haha=""
if isDWBA :
+
dwba_1 = subprocess.run(["../Cleopatra/InFileCreator", fn4, "0", "180", "0.1"] , stdout=subprocess.PIPE).stdout.decode('utf-8')
cmd = "../Cleopatra/ptolemy <%s.in> %s.out" % (fn4, fn4)
outFile = fn4+ ".out"
+ if os.path.exists(outFile):
+ os.remove(outFile)
os.system(cmd)
if os.path.exists(outFile) :
+ if os.path.exists(fn4 + ".root"):
+ os.remove(fn4 + ".root")
+ if os.path.exists(fn4 + ".Ex.txt"):
+ os.remove(fn4 + ".Ex.txt")
+ if os.path.exists(fn4 + ".Xsec.txt"):
+ os.remove(fn4 + ".Xsec.txt")
dwba_3 = subprocess.run(["../Cleopatra/ExtractXSec", outFile, "1"], stdout=subprocess.PIPE).stdout.decode('utf-8')
dwbaRootFile = fn4 + ".root"
dwbaExFile = fn4 + ".Ex.txt"
@@ -221,6 +230,9 @@ if isDWBA :
dwbaPNG = dwba_4.splitlines().pop()
+#if os.path.exists("transfer.root"):
+# os.remove("transfer.root");
+
if isDWBA :
result = subprocess.run(["../Cleopatra/Transfer", fn1, fn2, dwbaExFile, dwbaRootFile, "transfer.root", "reaction.dat", "0"], stdout=subprocess.PIPE).stdout.decode('utf-8')
else:
@@ -281,6 +293,8 @@ if dwbaPNG != "" :
print ("
Downlaod the %s" % (fn4+".root", fn4+".root", fn4+".root"))
print ("
")
+ print ("
for 2-nucleon transfer, Orbital take the form nL=X, where n is number of node, X is momnetum number.
+
- Ex [MeV] |
- Jπ |
- Orbital |
+ Ex [MeV] |
+ Jπ |
+ Orbital |
|
@@ -118,29 +118,29 @@ Max Ex: MeV
Incoming Channel |
|
@@ -148,29 +148,29 @@ Max Ex: MeV
| Outgoing Channel |
|
@@ -417,7 +417,7 @@ function addStates(){
client.addEventListener('loadstart',
function(e){
- document.getElementById('waiting').innerHTML = "wait....retrieving data..";
+ document.getElementById('waiting').innerHTML = "wait....retrieving data from IAEA..";
}
);
@@ -427,7 +427,8 @@ function addStates(){
//console.log(result);
document.getElementById('waiting').innerHTML = "";
-
+ let count = 0;
+
for( let i = 0; i < result.length; i++){
//console.log(i + ", " + result[i]);
if( i < 17 ) continue;
@@ -447,7 +448,7 @@ function addStates(){
if( (((parity) & 1) != 1) && jpi.slice(-1) == "+" ) continue;
if( (((parity >> 1) & 1) != 1) && jpi.slice(-1) == "-" ) continue;
-
+ count ++;
nRow = table.rows.length;
let row = table.insertRow(nRow-1);
row.innerHTML = ' | | \
@@ -455,6 +456,9 @@ function addStates(){
| ';
}
+ if( count == 0 ){
+ document.getElementById('waiting').innerHTML = "no states found.";
+ }
}
);