Changes in test/sasrealspace/test/sim_validation.py [aaf5e49:ac07a3a] in sasview

File:

• test/sasrealspace/test/sim_validation.py (modified) (4 diffs)

test/sasrealspace/test/sim_validation.py

@@ -5 +5 @@
     @license: This software is provided as part of the DANSE project
 """
-from __future__ import print_function
-
 import math, time, pylab
 
 try:
     import VolumeCanvas
-    print("Testing local version")
+    print "Testing local version"
 except:
-    print("Testing installed version")
+    print "Testing installed version"
     import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
      
@@ -252 +250 @@
         ana = validator.run_ana(q)
         sim, err = validator.run_sim(q)
-        print("q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
-                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err)))
+        print "q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
+                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err))
         output.write("%g  %g  %g  %g\n" % (q, ana, sim, err))
     output.close()
@@ -280 +278 @@
         ana = validator.run_ana2D(q*math.cos(phi), q*math.sin(phi))
         sim, err = validator.run_sim2D(q*math.cos(phi), q*math.sin(phi))
-        print("q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
-                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err)))
+        print "q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
+                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err))
         output.write("%g  %g  %g  %g\n" % (q, ana, sim, err))
-    print("Time elapsed: ", time.time()-t_0)
+    print "Time elapsed: ", time.time()-t_0
     output.close()
        
@@ -308 +306 @@
     for d in d_list:
         sim, err = validator.run_sim(q, density=d)
-        print("d=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%g) %s" % \
+        print "d=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%g) %s" % \
             (d, ana, sim, err, (sim-ana), (sim-ana)/ana, 
-             str(math.fabs(sim-ana)>err)))
+             str(math.fabs(sim-ana)>err))
         output.write("%g  %g  %g  %g \n" % (d, ana, sim, err))
     output.close()