Révision 8af49f6d modules/dos_input.py

b/modules/dos_input.py
290 290
    return molec_file
291 291

  
292 292

  
293
def get_cluster_magns():
294
    clust_magns_vals = ['energy', 'moi']
295
    cluster_magns_str = dos_inp.get('Isolated', 'cluster_magns',
296
                                    fallback='energy')
297
    cluster_magns_str.replace(',', ' ').replace(';', ' ')
298
    cluster_magns = cluster_magns_str.split(' ')
299
    cluster_magns = [m.lower() for m in cluster_magns]
300
    for m in cluster_magns:
301
        check_expect_val(m, clust_magns_vals)
302
    return cluster_magns
303

  
304

  
305 293
def get_num_conformers():
306 294
    err_msg = num_error % ('num_conformers', 'positive integer')
307 295
    num_conformers = try_command(dos_inp.getint, [(ValueError, err_msg)],
......
439 427
    return molec_neigh_ctrs
440 428

  
441 429

  
430
def get_select_magns():
431
    select_magns_vals = ['energy', 'moi']
432
    select_magns_str = dos_inp.get('Screening', 'select_magns',
433
                                    fallback='energy')
434
    select_magns_str.replace(',', ' ').replace(';', ' ')
435
    select_magns = select_magns_str.split(' ')
436
    select_magns = [m.lower() for m in select_magns]
437
    for m in select_magns:
438
        check_expect_val(m, select_magns_vals)
439
    return select_magns
440

  
441

  
442 442
def get_surf_norm_vect():
443 443
    import numpy as np
444 444
    err = "'surf_norm_vect' must be either a 3 component vector or 'x', 'y' " \
......
623 623
        return_vars['molec_file'] = get_molec_file()
624 624

  
625 625
        # Facultative options (Default/Fallback value present)
626
        return_vars['cluster_magns'] = get_cluster_magns()
627 626
        return_vars['num_conformers'] = get_num_conformers()
628 627
        # return_vars['num_prom_cand'] = get_num_prom_cand()
629 628
        # return_vars['iso_rmsd'] = get_iso_rmsd()
......
655 654
            raise ValueError(err)
656 655

  
657 656
        # Facultative options (Default value present)
657
        return_vars['select_magns'] = get_select_magns()
658 658
        return_vars['surf_norm_vect'] = get_surf_norm_vect()
659 659
        return_vars['try_disso'] = get_try_disso()
660 660
        return_vars['ads_algo'] = get_ads_algo()

Formats disponibles : Unified diff