diff --git a/SOLARIS_logo.png b/SOLARIS_logo.png new file mode 100644 index 0000000..bed86a6 Binary files /dev/null and b/SOLARIS_logo.png differ diff --git a/Simulation_gateway.py b/Simulation_gateway.py index 98d63b6..54bfdaf 100755 --- a/Simulation_gateway.py +++ b/Simulation_gateway.py @@ -63,7 +63,7 @@ else: fileitem = form['filename4'] if fileitem.filename: fn4 = os.path.basename(fileitem.filename) - if fn4.endswith('') : + if fn4.endswith('') or fn4.endswith('.txt') : open('files/' + fn4, 'wb').write(fileitem.file.read()) message4 = 'The file "' + fn4 + '" was uploaded successfully' else: @@ -79,7 +79,7 @@ if fileitem.filename: open('files/' + fn4a, 'wb').write(fileitem.file.read()) message4a = 'The file "' + fn4a + '" was uploaded successfully' else: - message4a = 'Need to be in extension file' + message4a = 'Need to be *.in file' fn4a = "" else: message4a = 'No file was uploaded' @@ -130,7 +130,6 @@ if fn4!="" or fn4a!="": os.system(cmd) isPtolemy = True if os.path.exists(outFile) : - dwba_2 = outFile dwba_3 = subprocess.run(["../Cleopatra/ExtractXSec", outFile, "1"], stdout=subprocess.PIPE).stdout.decode('utf-8') dwbaRootFile = fn4 + ".root" dwbaExFile = fn4 + ".Ex.txt" @@ -139,7 +138,7 @@ if fn4!="" or fn4a!="": isDWBA = True if fn1=="" or fn2=="": - result = "imcomplete input files for kinematocs Simulation" + result = "imcomplete input files for Kinematics Simulation" pngName = "" haha = "" else: @@ -165,6 +164,7 @@ print ("Content-Type: text/html\r\n\r\n") print ("") print ("") print ("") +print ("") print ("") if dwbaPNG != "" : @@ -176,14 +176,16 @@ if dwbaPNG != "" : if pngName != "" : print ("" % pngName) -print ("
Reaction File : %s" % message1) -print ("
DetectorGeo File : %s" % message2) -print ("
Ex File : %s" % message3) -print ("
DWBA File : %s" % message4) -print ("
DWBA.in File : %s" % message4a) -print ("
Plot Config File : %s" % message5) +print ("


#################################### programs text output") +print ("") +print ("" % message1) +print ("" % message2) +print ("" % message3) +print ("" % message4) +print ("" % message4a) +print ("" % message5) +print ("
Reaction File :%s
DetectorGeo File :%s
Ex File :%s
DWBA File :%s
DEBA.in File :%s
Plot Config File :%s
") print ("
%s " % dwba_1) -print ("
%s " % dwba_2) print ("
%s " % dwba_3) print ("
%s " % dwba_4) print ("
%s " % result) diff --git a/index.html b/index.html index f3353fe..5f98596 100644 --- a/index.html +++ b/index.html @@ -12,9 +12,13 @@ table, th, td { //border: 1px solid black; } + table.center{ + margin-left: auto; + margin-right: auto; + } header { - background-color: #DF0; - padding: 30px; + background-color: #F7CF3C; + padding: 10px; text-align: center; font-size: 35px; color: black; @@ -23,7 +27,7 @@ float: left; width : 400px; height: 100vh; - background: #ccc; + background: #6DB33E; padding: 0px; } article { @@ -31,7 +35,7 @@ padding: 0px; margin-left: 400px; height : 100vh; - background: #F6F6FF; + background: #1363A7; } @media (max-width: 1000px) { nav { @@ -49,7 +53,14 @@ -

SOLARIS Simulation

+
+ + + + + +
Simulation
+
@@ -160,7 +171,7 @@
- +
diff --git a/instruction.html b/instruction.html index db1edb4..680848f 100644 --- a/instruction.html +++ b/instruction.html @@ -1,14 +1,32 @@ - + + + +

Intructions:

+ +

This page is created and hosted by FSU

+ + + diff --git a/simpleSim.html b/simpleSim.html index 1ba3449..807393d 100644 --- a/simpleSim.html +++ b/simpleSim.html @@ -4,6 +4,13 @@ + +

I am working on it.

@@ -96,7 +103,5 @@
- -