Changeset 1370 in sassie_1_5


Ignore:
Timestamp:
Sep 13, 2017, 10:08:44 AM (4 years ago)
Author:
curtisj
Message:

working calculate and analyze modules

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • bin/chi_square_filter

    r1365 r1370  
    44import multiprocessing,time,string,socket
    55
    6 import sassie.analyze.chi_square_filter as chi_square_filter
     6import sassie.analyze.chi_square_filter.chi_square_filter as chi_square_filter
    77import sassie.interface.input_filter as input_filter
    88import sassie.interface.chi_square_filter_filter as chi_square_filter_filter
  • bin/density_plot

    r1365 r1370  
    44import multiprocessing,time,string,socket
    55
    6 import sassie.analyze.density_plot as density_plot
     6import sassie.analyze.density_plot.density_plot as density_plot
    77import sassie.interface.input_filter as input_filter
    88import sassie.interface.density_plot_filter as density_plot_filter
  • bin/em_to_sans

    r1365 r1370  
    44import multiprocessing,time,string,socket
    55
    6 import sassie.calculate.em_to_sans as em_to_sans
     6import sassie.calculate.em_to_sans.em_to_sans as em_to_sans
    77import sassie.interface.input_filter as input_filter
    88import sassie.interface.em_to_sans_filter as em_to_sans_filter
  • bin/sascalc

    r1365 r1370  
    1 #!/share/apps/local/anaconda2/bin/python
     1#!/bin/bash
    22
    33export LD_LIBRARY_PATH=/share/apps/local/cuda/lib64:$LD_LIBRARY_PATH
    4 exec /share/apps/local/anaconda/bin/python /share/apps/genapp/sassie2test/bin/sascalc_python "$@"
     4exec /share/apps/local/anaconda2/bin/python /opt/genapp/sassie_1_5/bin/sascalc_python "$@"
  • bin/sascalc_python

    r1365 r1370  
    66import sassie.interface.input_filter as input_filter
    77import sassie.interface.sascalc_filter as sascalc_filter
    8 import sassie.calculate.sascalc as sascalc
     8import sassie.calculate.sascalc.sascalc as sascalc
    99
    1010class SasCalc_Driver():
     
    377377                    shutil.rmtree(runname+'/'+self.module)
    378378
    379                 with open("/share/apps/genapp/sassie2/results/log","w") as outfile:
     379                with open("log","w") as outfile:
    380380                    json.dump("\nvariables\n",outfile)
    381381                    json.dump(variables,outfile)
  • bin/two_body_grid

    r1365 r1370  
    44import multiprocessing,time,string,socket
    55
    6 import sassie.simulate.rigid_body.two_body_grid.two_body_grid as two_body_grid
     6import sassie.simulate.two_body_grid.two_body_grid as two_body_grid
    77import sassie.interface.input_filter as input_filter
    88
  • prepend_python_she_bang.py

    r1332 r1370  
    77for name in glob.glob('bin/*'):
    88    if os.path.isfile(name):
    9         with open(name) as input_file:
    10             lines = input_file.readlines()
    119
    12         lines[0] = '#!'+python+'\n'
     10        if name != 'sascalc':
    1311
    14         with open(name, 'w') as output_file:
    15             for line in lines:
    16                 output_file.write(line)
     12            with open(name) as input_file:
     13                lines = input_file.readlines()
    1714
     15            lines[0] = '#!'+python+'\n'
     16
     17            with open(name, 'w') as output_file:
     18                for line in lines:
     19                    output_file.write(line)
     20
Note: See TracChangeset for help on using the changeset viewer.