From a130be8fd60384b995fa4d45136ffaa847049b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= Date: Wed, 4 Nov 2020 14:18:12 +0100 Subject: [PATCH] Use dictionary for GetTypeFromAcronym --- .../formats/default/fromXLSToLaTeXHandler.py | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/tools/lib/formats/default/fromXLSToLaTeXHandler.py b/tools/lib/formats/default/fromXLSToLaTeXHandler.py index 738bd77f..cb05338d 100644 --- a/tools/lib/formats/default/fromXLSToLaTeXHandler.py +++ b/tools/lib/formats/default/fromXLSToLaTeXHandler.py @@ -7,22 +7,19 @@ import numpy as np import json import itertools def GetTypeFromAcronym(acronym): - if acronym=="npi": - return r"n \rightarrow \pi^\star" - elif acronym=="ppi": - return r"\pi \rightarrow \pi^\star" - elif acronym=="n3s": - return r"n \rightarrow 3s" - elif acronym=="dou": - return "double" - elif acronym=="p3p": - return r"\pi \rightarrow 3p" - elif acronym=="spi": - return r"\sigma \rightarrow \pi^\star" - elif acronym=="non-d": - return None - else: - raise ValueError("Unrecognized acronym") + acroDict={ + "npi":r"n \rightarrow \pi^\star", + "ppi":r"\pi \rightarrow \pi^\star", + "n3s":r"n \rightarrow 3s", + "dou":"double", + "p3p":r"\pi \rightarrow 3p", + "spi":r"\sigma \rightarrow \pi^\star", + "non-d":None + } + try: + return acroDict[acronym] + except KeyError as ex: + raise ValueError("Unrecognized acronym") from ex def GetFullState(TexState,defaultDatatype=DataType.ABS,VR=None,typeAcronym=None,Soup=True): datatype=defaultDatatype lst=list(TexState)