Révision 5261a07f modules/dos_input.py

b/modules/dos_input.py
87 87
    """
88 88

  
89 89
    # Checks
90
    error_msg = "Function argument should be a str, sequence of integer " \
90
    error_msg = "Function argument should be a str, sequence of " \
91 91
                "numbers separated by ',' ';' or ' '." \
92 92
                "\nThey can be grouped in parentheses-like enclosers: '()', " \
93 93
                "'[]' or {}. Nested groups are not allowed. \n" \
......
501 501
    return max_helic_angle
502 502

  
503 503

  
504

  
505

  
506 504
def get_select_magns():
507 505
    select_magns_vals = ['energy', 'moi']
508 506
    select_magns_str = dos_inp.get('Screening', 'select_magns',
......
563 561
def get_set_angles():
564 562
    set_vals = ['euler', 'chemcat']
565 563
    check_expect_val(dos_inp.get('Screening', 'set_angles').lower(), set_vals)
566
    set_angles = dos_inp.get('Screening', 'set_angles', fallback='euler').lower()
564
    set_angles = dos_inp.get('Screening', 'set_angles',
565
                             fallback='euler').lower()
567 566
    return set_angles
568 567

  
569 568

  
......
781 780
        inp_vars['min_coll_height'] = get_min_coll_height()
782 781
        cart_axes = [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0],
783 782
                     [-1.0, 0.0, 0.0], [0.0, -1.0, 0.0], [0.0, 0.0, -1.0]]
784
        if inp_vars['min_coll_height'] is not False and \
785
                inp_vars['surf_norm_vect'].tolist() not in cart_axes:
783
        if inp_vars['min_coll_height'] is not False \
784
                and inp_vars['surf_norm_vect'].tolist() not in cart_axes:
786 785
            logger.warning("'min_coll_height' option is only implemented for "
787 786
                           "'surf_norm_vect' to be one of the x, y or z axes.")
788 787

  

Formats disponibles : Unified diff