QPMS
/
qpms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix typos in argproc.py, metavars to "labeled" parameters

This commit is contained in:
Marek Nečada 2022-06-03 08:34:02 +03:00
parent ccfb13a15c
commit 74d72100d4
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qpms/argproc.py
View File

@ -227,9 +227,10 @@ class hashable_complex_matrix(tuple):
numpy.ndarray(..., dtype=complex) (which by itself is not hashable)
"""
def __new__(self, matrix):
import numpy as np
if isinstance(matrix, str):
matrix = ast.literal_eval(string)
matrix = np.ndarray(matrix, dtype=complex, copy=False)
matrix = ast.literal_eval(matrix)
matrix = np.array(matrix, dtype=complex, copy=False)
return super().__new__(hashable_complex_matrix, (tuple(row) for row in matrix))
# auxiliary structures for t-matrix generator specifications
@ -275,42 +276,48 @@ class ArgParser:
mpgrp.add_argument("-p", "--position", nargs='+', action=make_dict_action(argtype=sfloat, postaction='append',
first_is_key=False), help="Particle positions, cartesion coordinates (default particle properties)")
mpgrp.add_argument("+p", "++position", nargs='+', action=make_dict_action(argtype=sfloat, postaction='append',
first_is_key=True), help="Particle positions, cartesian coordinates (labeled)")
first_is_key=True), metavar=('LABEL', 'POSITION'), help="Particle positions, cartesian coordinates (labeled)")
mpgrp.add_argument("-L", "--lMax", nargs=1, default={},
action=make_dict_action(argtype=int, postaction='store', first_is_key=False,),
help="Cutoff multipole degree (default)")
mpgrp.add_argument("+L", "++lMax", nargs=2,
action=make_dict_action(argtype=int, postaction='store', first_is_key=True,),
help="Cutoff multipole degree (labeled)")
metavar=('LABEL', 'LMAX'),
help="Cutoff multipole degree (labeled)")
mpgrp.add_argument("-m", "--material", nargs=1, default={},
action=make_dict_action(argtype=material_spec, postaction='store', first_is_key=False,),
help='particle material (Au, Ag, ... for Lorentz-Drude or number for constant refractive index) (default)')
mpgrp.add_argument("+m", "++material", nargs=2,
action=make_dict_action(argtype=material_spec, postaction='store', first_is_key=True,),
metavar=('LABEL', 'MATERIAL'),
help='particle material (Au, Ag, ... for Lorentz-Drude or number for constant refractive index) (labeled)')
mpgrp.add_argument("-r", "--radius", nargs=1, default={},
action=make_dict_action(argtype=float, postaction='store', first_is_key=False,),
help='particle radius (sphere or cylinder; default)')
mpgrp.add_argument("+r", "++radius", nargs=2,
action=make_dict_action(argtype=float, postaction='store', first_is_key=True,),
metavar=('LABEL', 'RADIUS'),
help='particle radius (sphere or cylinder; labeled)')
mpgrp.add_argument("-H", "--height", nargs=1, default={},
action=make_dict_action(argtype=float, postaction='store', first_is_key=False,),
help='particle radius (cylinder; default)')
mpgrp.add_argument("+H", "++height", nargs=2,
action=make_dict_action(argtype=float, postaction='store', first_is_key=True,),
metavar=('LABEL', 'HEIGȞT'),
help='particle radius (cylinder; labeled)')
# Alternatively, add a constant T-matrix
mpgrp.add_argmuent("-w", "--vswf-set", nargs=1, default={},
action=make_dict_action(argtype=string2basespec, postaction='store', first_is_key=False),
mpgrp.add_argument("-w", "--vswf-set", nargs=1, default={},
action=make_dict_action(argtype=string2bspec, postaction='store', first_is_key=False),
help='Manual specification of VSWF set codes (format as a python list of integers); see docs on qpms_uvswfi_t for valid codes or simply use --lMax instead. Overrides --lMax.')
mpgrp.add_argmuent("+w", "++vswf-set", nargs=2, default={},
action=make_dict_action(argtype=string2basespec, postaction='store', first_is_key=True),
mpgrp.add_argument("+w", "++vswf-set", nargs=2, default={},
action=make_dict_action(argtype=string2bspec, postaction='store', first_is_key=True),
metavar=('LABEL', "VSWF_SET"),
help='Manual specification of VSWF set codes (format as a python list of integers); see docs on qpms_uvswfi_t for valid codes or simply use ++lMax instead. Overrides ++lMax and --lMax.')
mpgrp.add_argmuent("-T", "--constant-tmatrix", nargs=1, default={},
mpgrp.add_argument("-T", "--constant-tmatrix", nargs=1, default={},
action=make_dict_action(argtype=hashable_complex_matrix, postaction='store', first_is_key=False),
help='constant T-matrix (elements must correspond to --vswf-set)')
mpgrp.add_argmuent("+T", "++constant-tmatrix", nargs=2, default={},
mpgrp.add_argument("+T", "++constant-tmatrix", nargs=2, default={},
metavar=('LABEL', 'TMATRIX'),
action=make_dict_action(argtype=hashable_complex_matrix, postaction='store', first_is_key=True),
help='constant T-matrix (elements must correspond to ++vswf-set)')