Révision 0dfa15ff modules/dos_input.py

b/modules/dos_input.py
503 503
    return screen_rmsd
504 504

  
505 505

  
506
def get_coll_bottom_z():
507
    err_msg = num_error % ('collision_bottom_z', 'decimal number')
508
    coll_bottom_z = dos_inp.get('Screening', 'collision_bottom_z',
509
                                fallback="False")
510
    if coll_bottom_z.lower() in turn_false_answers:
511
        coll_bottom_z = False
506
def get_coll_bottom():
507
    err_msg = num_error % ('collision_bottom', 'decimal number')
508
    coll_bottom = dos_inp.get('Screening', 'collision_bottom',
509
                              fallback="False")
510
    if coll_bottom.lower() in turn_false_answers:
511
        coll_bottom = False
512 512
    else:
513
        coll_bottom_z = try_command(float, [(ValueError, err_msg)],
514
                                    coll_bottom_z)
513
        coll_bottom = try_command(float, [(ValueError, err_msg)], coll_bottom)
515 514

  
516
    return coll_bottom_z
515
    return coll_bottom
517 516

  
518 517

  
519 518
def get_refine_inp_file():
......
647 646
        return_vars['sample_points_per_angle'] = get_pts_per_angle()
648 647
        return_vars['collision_threshold'] = get_coll_thrsld()
649 648
        # return_vars['screen_rmsd'] = get_screen_rmsd()
650
        return_vars['collision_bottom_z'] = get_coll_bottom_z()
649
        return_vars['collision_bottom'] = get_coll_bottom()
651 650

  
652 651
    # Refinement
653 652
    if refinement:

Formats disponibles : Unified diff