Ignore:
Timestamp:
Apr 30, 2017 6:15:17 PM (7 years ago)
Author:
andyfaff
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
a1b8fee
Parents:
b636dfc5
Message:

MAINT: using print function

Location:
src/sas/sascalc/simulation/pointsmodelpy/tests
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py

    rd85c194 r9c3d784  
    1717    from pointsmodelpy import pointsmodelpy as pointsmodelpymodule 
    1818 
    19     print "copyright information:" 
    20     print "   ", pointsmodelpy.copyright() 
    21     print "   ", pointsmodelpymodule.copyright() 
     19    print("copyright information:") 
     20    print("   ", pointsmodelpy.copyright()) 
     21    print("   ", pointsmodelpymodule.copyright()) 
    2222 
    23     print 
    24     print "module information:" 
    25     print "    file:", pointsmodelpymodule.__file__ 
    26     print "    doc:", pointsmodelpymodule.__doc__ 
    27     print "    contents:", dir(pointsmodelpymodule) 
     23    print() 
     24    print("module information:") 
     25    print("    file:", pointsmodelpymodule.__file__) 
     26    print("    doc:", pointsmodelpymodule.__doc__) 
     27    print("    contents:", dir(pointsmodelpymodule)) 
    2828 
    29     print 
    30     print pointsmodelpymodule.hello() 
     29    print() 
     30    print(pointsmodelpymodule.hello()) 
    3131 
    3232# version 

  • src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py

    r959eb01 r9c3d784  
    4646 
    4747        data = ImageData(value_grid, index_vals) 
    48         print value_grid, index_vals 
     48        print(value_grid, index_vals) 
    4949         
    5050        # Create the index axes 

  • src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py

    r959eb01 r9c3d784  
    6161  iqPy.OutputIQ(iqcomplex,"testcomplex2.iq") 
    6262 
    63   print "p(r) is saved in testcomplex2.pr" 
    64   print "I(Q) is saved in testcomplex2.iq" 
    65   print "pass" 
     63  print("p(r) is saved in testcomplex2.pr") 
     64  print("I(Q) is saved in testcomplex2.iq") 
     65  print("pass") 
    6666 
    6767#testing 3, insert one empty pdbmodel and one loresmodel 
    … …  
    8888  iqPy.OutputIQ(iqcomplex,"testcomplex3.iq") 
    8989 
    90   print "p(r) is saved in testcomplex3.pr" 
    91   print "I(Q) is saved in testcomplex3.iq" 
    92   print "pass" 
     90  print("p(r) is saved in testcomplex3.pr") 
     91  print("I(Q) is saved in testcomplex3.iq") 
     92  print("pass") 
    9393 
    9494# Test 2D complex model 
    … …  
    106106    pointsmodelpy.get_complexpoints(complex,vpcomplex); 
    107107  
    108     print pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.1,0.1); 
    109     print pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.01,0.1); 
     108    print(pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.1,0.1)); 
     109    print(pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.01,0.1)); 
    110110 
    111111 

  • src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py

    r959eb01 r9c3d784  
    1010#    print "   ", pointsmodelpymodule.copyright() 
    1111 
    12     print 
    13     print "module information:" 
    14     print "    file:", pointsmodelpy.__file__ 
    15     print "    doc:", pointsmodelpy.__doc__ 
    16     print "    contents:", dir(pointsmodelpy) 
    17     print "    contents:", dir(geoshapespy) 
     12    print() 
     13    print("module information:") 
     14    print("    file:", pointsmodelpy.__file__) 
     15    print("    doc:", pointsmodelpy.__doc__) 
     16    print("    contents:", dir(pointsmodelpy)) 
     17    print("    contents:", dir(geoshapespy)) 
    1818 
    1919#    a = geoshapespy.new_singlehelix(10,2,30,2) 
    … …  
    4646    pointsmodelpy.outputPDB(lm,vp,"modelpy.pseudo.pdb") 
    4747 
    48     print "calculating distance distribution" 
     48    print("calculating distance distribution") 
    4949    rmax = pointsmodelpy.get_lores_pr(lm,vp) 
    50     print "finish calculating get_lores_pr, and rmax is:", rmax 
     50    print("finish calculating get_lores_pr, and rmax is:", rmax) 
    5151    pointsmodelpy.outputPR(lm,"testlores.pr") 
    5252    pointsmodelpy.get_lores_iq(lm,iq) 
    … …  
    5454    iqPy.OutputIQ(iq, "testlores.iq") 
    5555 
    56     print "Testing get I from a single q" 
     56    print("Testing get I from a single q") 
    5757    result = pointsmodelpy.get_lores_i(lm,0.1) 
    58     print "The I(0.1) is: %s" % str(result)  
     58    print("The I(0.1) is: %s" % str(result))  
    5959 
    6060# version 

  • src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py

    r959eb01 r9c3d784  
    4545  value_grid = zeros((100,100),Float) 
    4646  width, height = value_grid.shape 
    47   print width,height 
     47  print(width,height) 
    4848 
    4949  I = pointsmodelpy.calculateI_Qxy(lm,0.00001,0.000002) 
    50   print I 
     50  print(I) 
    5151 
    5252  Imax = 0 
    … …  
    8686  value_grid = zeros((100,100),Float) 
    8787  width, height = value_grid.shape 
    88   print width,height 
     88  print(width,height) 
    8989 
    9090  I = pointsmodelpy.calculateI_Qxy(lm,0.00001,0.000002) 
    91   print I 
     91  print(I) 
    9292 
    9393  Imax = 0 
    … …  
    109109if __name__ == "__main__": 
    110110 
    111   print "start to test lores 2D" 
     111  print("start to test lores 2D") 
    112112#  test_lores2d(10) 
    113113  value_grid = get2d_2() 
    114   print value_grid 
    115   print "pass" 
     114  print(value_grid) 
     115  print("pass") 
Note: See TracChangeset for help on using the changeset viewer.