fixing plot production

RegressionTests/run/regressiontest.py

@@ -130,7 +130,7 @@ class RegressionTest:
 
             # move plots to plot dir
             d = datetime.date.today()
-            plotdir = "results/" + d.isoformat() + "/plots_" + d.isoformat()
+            plotdir = "results/" + d.isoformat() + "/plots"
 
             subprocess.getoutput("mkdir " + curd + "/" + plotdir)
             subprocess.getoutput("cp -rf *.png " + curd + "/" + plotdir)
@@ -664,5 +664,4 @@ class LossTest:
     variable_list = {"x":1, "y":2, "z":3, "px":4, "py":5, "pz":6,
                      "track_id":7, "turn":8, "time":9}
     mode_list = {"last":testLast, "all":testAll, "error":testError,
-                     "avg":testMean}
-
+                     "avg":testMean}
\ No newline at end of file

RegressionTests/run/run-reg-tests.py

@@ -190,7 +190,7 @@ def main(argv):
         brokentests = rep.NrBroken()
         webfilename = "results_%s_%s_%s.xml" % (d.day, d.month, d.year)
         shutil.copy ("results.xml", www_folder + "/" + webfilename)
-        subprocess.getoutput("cp -rf plots_" + d.isoformat() + " " + www_folder + "/")
+        subprocess.getoutput("cp -rf results/" + d.isoformat() + "/plots " + www_folder + "/plots_" + d.isoformat())
         indexhtml = open(www_folder + "/index.html").readlines()
         for line in range(len(indexhtml)):
             if "insert here" in indexhtml[line]:
@@ -217,8 +217,6 @@ def main(argv):
 
         subprocess.getoutput("cp -rf " + "results.xml " + resultdir)
 
-    if runAsUser:
-        subprocess.getoutput("rm -rf " + regdir + "/plots_" + d.isoformat())
     bailout(runAsUser)
 
 #call main

RegressionTests/run/tools.py

@@ -192,4 +192,4 @@ def genplot(simname, var):
     else:
         print ("Error in genplot: Cannot find stat variable!")
 
-    return "plots_" + d.isoformat() + "/" + filename + ".png"
+    return "plots_" + d.isoformat() + "/" + filename + ".png"
\ No newline at end of file