pyBADA 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

pyBADA/bada3.py

@@ -18,7 +18,7 @@ from pyBADA import constants as const
 from pyBADA import conversions as conv
 from pyBADA import atmosphere as atm
 from pyBADA import configuration as configuration
-from pyBADA.aircraft import Airplane, BadaFamily
+from pyBADA.aircraft import Airplane, BadaFamily, Bada
 
 
 def proper_round(num, dec=0):
@@ -42,41 +42,13 @@ class Parser(object):
         pass
 
     @staticmethod
-    def list_subfolders(folderPath):
-        """
-        Lists all subfolders within a specified directory.
-
-        :param folderPath: Path to the directory where subfolders are to be listed.
-        :type folderPath: str
-        :returns: A list of subfolder names within the specified directory.
-        :rtype: list of str
-
-        This function retrieves all entries in the given directory and filters out
-        the ones that are not directories. Only the names of the subfolders are returned.
-        """
-
-        # List all entries in the directory
-        entries = os.listdir(folderPath)
-
-        # Filter out entries that are directories
-        subfolders = [
-            entry
-            for entry in entries
-            if os.path.isdir(os.path.join(folderPath, entry))
-        ]
-
-        return subfolders
-
-    @staticmethod
-    def parseXML(filePath, badaVersion, acName):
+    def parseXML(filePath, acName):
         """
         Parses a BADA3 XML formatted file for aircraft performance data.
 
         :param filePath: Path to the XML file containing BADA data.
-        :param badaVersion: Version of BADA to be parsed.
         :param acName: Name of the aircraft for which data is being parsed from the XML file.
         :type filePath: str
-        :type badaVersion: str
         :type acName: str
         :raises IOError: If the file cannot be found or read.
         :raises ValueError: If the BADA version is unsupported or if parsing fails.
@@ -85,10 +57,7 @@ class Parser(object):
         :rtype: pd.DataFrame
         """
 
-        filename = (
-            os.path.join(filePath, "BADA3", badaVersion, acName, acName)
-            + ".xml"
-        )
+        filename = os.path.join(filePath, acName, acName) + ".xml"
 
         try:
             tree = ET.parse(filename)
@@ -391,15 +360,13 @@ class Parser(object):
         return f, line
 
     @staticmethod
-    def parseOPF(filePath, badaVersion, acName):
+    def parseOPF(filePath, acName):
         """
         Parses a BADA3 OPF (Operational Performance File) ASCII formatted file for aircraft performance data.
 
         :param filePath: Path to the BADA3 OPF ASCII formatted file.
-        :param badaVersion: BADA version being used.
         :param acName: ICAO aircraft designation (e.g., 'A320').
         :type filePath: str
-        :type badaVersion: str
         :type acName: str
         :raises IOError: If the file cannot be opened or read.
         :returns: A pandas DataFrame containing the parsed aircraft performance data.
@@ -409,8 +376,6 @@ class Parser(object):
         filename = (
             os.path.join(
                 filePath,
-                "BADA3",
-                badaVersion,
                 acName,
             )
             + ".OPF"
@@ -624,24 +589,20 @@ class Parser(object):
         return df_single
 
     @staticmethod
-    def parseAPF(filePath, badaVersion, acName):
+    def parseAPF(filePath, acName):
         """
         Parses a BADA3 APF ASCII formatted file for aircraft performance data.
 
         :param filePath: Path to the BADA3 APF ASCII formatted file.
-        :param badaVersion: BADA version being used.
         :param acName: ICAO aircraft designation (e.g., 'A320').
         :type filePath: str
-        :type badaVersion: str
         :type acName: str
         :raises IOError: If the file cannot be opened or read.
         :returns: A pandas DataFrame containing the parsed aircraft performance data.
         :rtype: pd.DataFrame
         """
 
-        filename = (
-            os.path.join(filePath, "BADA3", badaVersion, acName) + ".APF"
-        )
+        filename = os.path.join(filePath, acName) + ".APF"
 
         dataLines = list()
         with open(filename, "r", encoding="latin-1") as f:
@@ -727,19 +688,17 @@ class Parser(object):
         return combined_df
 
     @staticmethod
-    def readSynonym(filePath, badaVersion):
+    def readSynonym(filePath):
         """
         Reads a BADA3 SYNONYM.NEW ASCII file and returns a dictionary of model-synonym pairs.
 
         :param filePath: Path to the directory containing BADA3 files.
-        :param badaVersion: BADA version being used.
         :type filePath: str
-        :type badaVersion: str
         :returns: A dictionary where the keys are aircraft models and the values are the corresponding file names.
         :rtype: dict
         """
 
-        filename = os.path.join(filePath, "BADA3", badaVersion, "SYNONYM.NEW")
+        filename = os.path.join(filePath, "SYNONYM.NEW")
 
         # synonym - file name pair dictionary
         synonym_fileName = {}
@@ -764,14 +723,12 @@ class Parser(object):
         return synonym_fileName
 
     @staticmethod
-    def readSynonymXML(filePath, badaVersion):
+    def readSynonymXML(filePath):
         """
         Reads a BADA3 SYNONYM.xml file and returns a dictionary of model-synonym pairs.
 
         :param filePath: Path to the directory containing BADA3 files.
-        :param badaVersion: BADA version being used.
         :type filePath: str
-        :type badaVersion: str
         :returns: A dictionary where the keys are aircraft models (codes) and the values are the corresponding file names.
         :rtype: dict
         :raises IOError: If the XML file is not found or cannot be read.
@@ -780,7 +737,7 @@ class Parser(object):
         If the XML file is not found or is improperly formatted, an IOError is raised.
         """
 
-        filename = os.path.join(filePath, "BADA3", badaVersion, "SYNONYM.xml")
+        filename = os.path.join(filePath, "SYNONYM.xml")
 
         # synonym - file name pair dictionary
         synonym_fileName = {}
@@ -803,15 +760,13 @@ class Parser(object):
         return synonym_fileName
 
     @staticmethod
-    def parseSynonym(filePath, badaVersion, acName):
+    def parseSynonym(filePath, acName):
         """
         Parses either the ASCII or XML synonym file and returns the file name corresponding to the aircraft.
 
         :param filePath: Path to the directory containing BADA3 files.
-        :param badaVersion: BADA version being used.
         :param acName: ICAO aircraft designation for which the file name is needed.
         :type filePath: str
-        :type badaVersion: str
         :type acName: str
         :returns: The file name corresponding to the aircraft, or None if not found.
         :rtype: str or None
@@ -821,11 +776,11 @@ class Parser(object):
         It returns the associated file name or None if the aircraft synonym is not found.
         """
 
-        synonym_fileName = Parser.readSynonym(filePath, badaVersion)
+        synonym_fileName = Parser.readSynonym(filePath)
 
         # if ASCI synonym does not exist, try XML synonym file
         if not synonym_fileName:
-            synonym_fileName = Parser.readSynonymXML(filePath, badaVersion)
+            synonym_fileName = Parser.readSynonymXML(filePath)
 
         if synonym_fileName and acName in synonym_fileName:
             fileName = synonym_fileName[acName]
@@ -834,19 +789,18 @@ class Parser(object):
             return None
 
     @staticmethod
-    def readGPF(filePath, badaVersion):
+    def readGPF(filePath):
         """
         Parses a BADA3 GPF ASCII formatted file.
 
         :param filePath: Path to the directory containing BADA3 files.
-        :param badaVersion: BADA version being used.
         :type filePath: str
         :raises IOError: If the GPF file cannot be opened or read.
         :returns: A list of dictionaries, each containing GPF parameters like engine type, flight phase, and parameter values.
         :rtype: list of dict
         """
 
-        filename = os.path.join(filePath, "BADA3", badaVersion, "BADA.GPF")
+        filename = os.path.join(filePath, "BADA.GPF")
 
         GPFparamList = list()
 
@@ -873,12 +827,11 @@ class Parser(object):
         return GPFparamList
 
     @staticmethod
-    def readGPFXML(filePath, badaVersion):
+    def readGPFXML(filePath):
         """
         Parses a BADA3 GPF XML formatted file.
 
         :param filePath: Path to the directory containing BADA3 files.
-        :param badaVersion: BADA version being used.
         :type filePath: str
         :raises IOError: If the XML file is not found or cannot be read.
         :returns: A list of dictionaries, each containing GPF parameters such as engine type, flight phase, and performance values.
@@ -889,7 +842,7 @@ class Parser(object):
         It parses the XML structure and returns a list of dictionaries representing these parameters.
         """
 
-        filename = os.path.join(filePath, "BADA3", badaVersion, "GPF.xml")
+        filename = os.path.join(filePath, "GPF.xml")
 
         GPFparamList = list()
 
@@ -1430,23 +1383,21 @@ class Parser(object):
         return GPFparamList
 
     @staticmethod
-    def parseGPF(filePath, badaVersion):
+    def parseGPF(filePath):
         """
         Parses a BADA3 (GPF) from either ASCII or XML format.
 
         :param filePath: Path to the directory containing BADA3 files.
-        :param badaVersion: BADA version being used.
         :type filePath: str
-        :type badaVersion: str
         :returns: A pandas DataFrame containing GPF data.
         :rtype: pd.DataFrame
         """
 
-        GPFdata = Parser.readGPF(filePath, badaVersion)
+        GPFdata = Parser.readGPF(filePath)
 
         # if ASCI GPF does not exist, try XML GPF file
         if not GPFdata:
-            GPFdata = Parser.readGPFXML(filePath, badaVersion)
+            GPFdata = Parser.readGPFXML(filePath)
 
         # Single row dataframe
         data = {"GPFdata": [GPFdata]}
@@ -1532,31 +1483,32 @@ class Parser(object):
         """
 
         if filePath == None:
-            filePath = configuration.getAircraftPath()
+            filePath = configuration.getBadaVersionPath(
+                badaFamily="BADA3", badaVersion=badaVersion
+            )
         else:
             filePath = filePath
 
         # parsing GPF file
-        GPFparsedDataframe = Parser.parseGPF(filePath, badaVersion)
+        GPFparsedDataframe = Parser.parseGPF(filePath)
 
         # try to get subfolders, if they exist
         # get names of all the folders in the main BADA model folder to search for XML files
-        folderPath = os.path.join(filePath, "BADA3", badaVersion)
-        subfolders = Parser.list_subfolders(folderPath)
+        subfolders = configuration.list_subfolders(filePath)
 
         if not subfolders:
             # use APF and OPF files
             merged_df = pd.DataFrame()
 
             # get synonym-filename pairs
-            synonym_fileName = Parser.readSynonym(filePath, badaVersion)
+            synonym_fileName = Parser.readSynonym(filePath)
 
             for synonym in synonym_fileName:
                 file = synonym_fileName[synonym]
 
                 # parse the original data of a model
-                OPFDataFrame = Parser.parseOPF(filePath, badaVersion, file)
-                APFDataFrame = Parser.parseAPF(filePath, badaVersion, file)
+                OPFDataFrame = Parser.parseOPF(filePath, file)
+                APFDataFrame = Parser.parseAPF(filePath, file)
 
                 df = Parser.combineOPF_APF(OPFDataFrame, APFDataFrame)
 
@@ -1578,14 +1530,14 @@ class Parser(object):
             merged_df = pd.DataFrame()
 
             # get synonym-filename pairs
-            synonym_fileName = Parser.readSynonymXML(filePath, badaVersion)
+            synonym_fileName = Parser.readSynonymXML(filePath)
 
             for synonym in synonym_fileName:
                 file = synonym_fileName[synonym]
 
                 if file in subfolders:
                     # parse the original XML of a model
-                    df = Parser.parseXML(filePath, badaVersion, file)
+                    df = Parser.parseXML(filePath, file)
 
                     # rename acName in the dateaframe to match the synonym model name
                     df.at[0, "acName"] = synonym
@@ -1602,72 +1554,8 @@ class Parser(object):
 
             return merged_df
 
-    @staticmethod
-    def getBADAParameters(df, acName, parameters):
-        """
-        Retrieves specified parameters for a given aircraft name from a DataFrame.
-
-        :param df: DataFrame containing BADA aircraft data.
-        :param acName: Name of the aircraft or list of aircraft names to search for.
-        :param parameters: List of column names (or a single column name) to retrieve.
-        :type df: pd.DataFrame
-        :type acName: list or str
-        :type parameters: list or str
-        :returns: A DataFrame containing the specified parameters for the given aircraft.
-        :rtype: pd.DataFrame
-        :raises ValueError: If any of the specified columns or aircraft names are not found.
-        """
-
-        # Ensure parameters is a list
-        if isinstance(parameters, str):
-            parameters = [parameters]
-
-        # Ensure acName is a list
-        if isinstance(acName, str):
-            acName = [acName]
-
-        # Ensure all requested parameters exist in the DataFrame
-        missing_cols = [col for col in parameters if col not in df.columns]
-        if missing_cols:
-            raise ValueError(
-                f"The following parameters are not in the DataFrame columns: {missing_cols}"
-            )
-
-        # Filter rows where 'acName' matches any of the specified aircraft names
-        filtered_df = df[df["acName"].isin(acName)]
-
-        # Check if any rows were found
-        if filtered_df.empty:
-            raise ValueError(f"No entries found for aircraft(s): {acName}.")
-        else:
-            # Select the required columns
-            result_df = filtered_df[["acName"] + parameters].reset_index(
-                drop=True
-            )
-            return result_df
-
-    @staticmethod
-    def safe_get(df, column_name, default_value=None):
-        """
-        Safely retrieves a column's value from a DataFrame, returning a default value if the column does not exist.
-
-        :param df: DataFrame to retrieve the value from.
-        :param column_name: Name of the column to retrieve.
-        :param default_value: Value to return if the column does not exist. Default is None.
-        :type df: pd.DataFrame
-        :type column_name: str
-        :type default_value: any
-        :returns: The value from the specified column or the default value if the column is missing.
-        :rtype: any
-        """
-
-        if column_name in df.columns:
-            return df[column_name].iloc[0]
-        else:
-            return default_value
-
 
-class BADA3(Airplane):
+class BADA3(Airplane, Bada):
     """This class implements the part of BADA3 performance model that will be used in other classes following the BADA3 manual.
 
     :param AC: Aircraft object {BADA3}.
@@ -4827,7 +4715,9 @@ class Bada3Aircraft(BADA3):
         self.BADAVersion = badaVersion
 
         if filePath == None:
-            self.filePath = configuration.getAircraftPath()
+            self.filePath = configuration.getBadaVersionPath(
+                badaFamily="BADA3", badaVersion=badaVersion
+            )
         else:
             self.filePath = filePath
 
@@ -4835,69 +4725,83 @@ class Bada3Aircraft(BADA3):
         if allData is not None and acName in allData["acName"].values:
             filtered_df = allData[allData["acName"] == acName]
 
-            self.acName = Parser.safe_get(filtered_df, "acName", None)
-            self.xmlFiles = Parser.safe_get(filtered_df, "xmlFiles", None)
+            self.acName = configuration.safe_get(filtered_df, "acName", None)
+            self.xmlFiles = configuration.safe_get(
+                filtered_df, "xmlFiles", None
+            )
 
-            self.modificationDateOPF = Parser.safe_get(
+            self.modificationDateOPF = configuration.safe_get(
                 filtered_df, "modificationDateOPF", None
             )
-            self.modificationDateAPF = Parser.safe_get(
+            self.modificationDateAPF = configuration.safe_get(
                 filtered_df, "modificationDateAPF", None
             )
 
-            self.ICAO = Parser.safe_get(filtered_df, "ICAO", None)
-            self.numberOfEngines = Parser.safe_get(
+            self.ICAO = configuration.safe_get(filtered_df, "ICAO", None)
+            self.numberOfEngines = configuration.safe_get(
                 filtered_df, "numberOfEngines", None
             )
-            self.engineType = Parser.safe_get(filtered_df, "engineType", None)
-            self.engines = Parser.safe_get(filtered_df, "engines", None)
-            self.WTC = Parser.safe_get(filtered_df, "WTC", None)
-            self.mass = Parser.safe_get(filtered_df, "mass", None)
-
-            self.MTOW = Parser.safe_get(filtered_df, "MTOW", None)
-            self.OEW = Parser.safe_get(filtered_df, "OEW", None)
-            self.MPL = Parser.safe_get(filtered_df, "MPL", None)
-            self.MREF = Parser.safe_get(filtered_df, "MREF", None)
-            self.VMO = Parser.safe_get(filtered_df, "VMO", None)
-            self.MMO = Parser.safe_get(filtered_df, "MMO", None)
-            self.hmo = Parser.safe_get(filtered_df, "hmo", None)
-            self.Hmax = Parser.safe_get(filtered_df, "Hmax", None)
-            self.tempGrad = Parser.safe_get(filtered_df, "tempGrad", None)
-
-            self.S = Parser.safe_get(filtered_df, "S", None)
-            self.Clbo = Parser.safe_get(filtered_df, "Clbo", None)
-            self.k = Parser.safe_get(filtered_df, "k", None)
-            self.Vstall = Parser.safe_get(filtered_df, "Vstall", None)
-            self.CD0 = Parser.safe_get(filtered_df, "CD0", None)
-            self.CD2 = Parser.safe_get(filtered_df, "CD2", None)
-            self.HLids = Parser.safe_get(filtered_df, "HLids", None)
-            self.Ct = Parser.safe_get(filtered_df, "Ct", None)
-            self.CTdeslow = Parser.safe_get(filtered_df, "CTdeslow", None)
-            self.CTdeshigh = Parser.safe_get(filtered_df, "CTdeshigh", None)
-            self.CTdesapp = Parser.safe_get(filtered_df, "CTdesapp", None)
-            self.CTdesld = Parser.safe_get(filtered_df, "CTdesld", None)
-            self.HpDes = Parser.safe_get(filtered_df, "HpDes", None)
-            self.Cf = Parser.safe_get(filtered_df, "Cf", None)
-            self.CfDes = Parser.safe_get(filtered_df, "CfDes", None)
-            self.CfCrz = Parser.safe_get(filtered_df, "CfCrz", None)
-            self.TOL = Parser.safe_get(filtered_df, "TOL", None)
-            self.LDL = Parser.safe_get(filtered_df, "LDL", None)
-            self.span = Parser.safe_get(filtered_df, "span", None)
-            self.length = Parser.safe_get(filtered_df, "length", None)
-
-            self.V1 = Parser.safe_get(filtered_df, "V1", None)
-            self.V2 = Parser.safe_get(filtered_df, "V2", None)
-            self.M = Parser.safe_get(filtered_df, "M", None)
-
-            self.GPFdata = Parser.safe_get(filtered_df, "GPFdata", None)
-
-            self.drone = Parser.safe_get(filtered_df, "drone", None)
-
-            self.DeltaCD = Parser.safe_get(filtered_df, "DeltaCD", None)
-            self.speedSchedule = Parser.safe_get(
+            self.engineType = configuration.safe_get(
+                filtered_df, "engineType", None
+            )
+            self.engines = configuration.safe_get(filtered_df, "engines", None)
+            self.WTC = configuration.safe_get(filtered_df, "WTC", None)
+            self.mass = configuration.safe_get(filtered_df, "mass", None)
+
+            self.MTOW = configuration.safe_get(filtered_df, "MTOW", None)
+            self.OEW = configuration.safe_get(filtered_df, "OEW", None)
+            self.MPL = configuration.safe_get(filtered_df, "MPL", None)
+            self.MREF = configuration.safe_get(filtered_df, "MREF", None)
+            self.VMO = configuration.safe_get(filtered_df, "VMO", None)
+            self.MMO = configuration.safe_get(filtered_df, "MMO", None)
+            self.hmo = configuration.safe_get(filtered_df, "hmo", None)
+            self.Hmax = configuration.safe_get(filtered_df, "Hmax", None)
+            self.tempGrad = configuration.safe_get(
+                filtered_df, "tempGrad", None
+            )
+
+            self.S = configuration.safe_get(filtered_df, "S", None)
+            self.Clbo = configuration.safe_get(filtered_df, "Clbo", None)
+            self.k = configuration.safe_get(filtered_df, "k", None)
+            self.Vstall = configuration.safe_get(filtered_df, "Vstall", None)
+            self.CD0 = configuration.safe_get(filtered_df, "CD0", None)
+            self.CD2 = configuration.safe_get(filtered_df, "CD2", None)
+            self.HLids = configuration.safe_get(filtered_df, "HLids", None)
+            self.Ct = configuration.safe_get(filtered_df, "Ct", None)
+            self.CTdeslow = configuration.safe_get(
+                filtered_df, "CTdeslow", None
+            )
+            self.CTdeshigh = configuration.safe_get(
+                filtered_df, "CTdeshigh", None
+            )
+            self.CTdesapp = configuration.safe_get(
+                filtered_df, "CTdesapp", None
+            )
+            self.CTdesld = configuration.safe_get(filtered_df, "CTdesld", None)
+            self.HpDes = configuration.safe_get(filtered_df, "HpDes", None)
+            self.Cf = configuration.safe_get(filtered_df, "Cf", None)
+            self.CfDes = configuration.safe_get(filtered_df, "CfDes", None)
+            self.CfCrz = configuration.safe_get(filtered_df, "CfCrz", None)
+            self.TOL = configuration.safe_get(filtered_df, "TOL", None)
+            self.LDL = configuration.safe_get(filtered_df, "LDL", None)
+            self.span = configuration.safe_get(filtered_df, "span", None)
+            self.length = configuration.safe_get(filtered_df, "length", None)
+
+            self.V1 = configuration.safe_get(filtered_df, "V1", None)
+            self.V2 = configuration.safe_get(filtered_df, "V2", None)
+            self.M = configuration.safe_get(filtered_df, "M", None)
+
+            self.GPFdata = configuration.safe_get(filtered_df, "GPFdata", None)
+
+            self.drone = configuration.safe_get(filtered_df, "drone", None)
+
+            self.DeltaCD = configuration.safe_get(filtered_df, "DeltaCD", None)
+            self.speedSchedule = configuration.safe_get(
                 filtered_df, "speedSchedule", None
             )
-            self.aeroConfig = Parser.safe_get(filtered_df, "aeroConfig", None)
+            self.aeroConfig = configuration.safe_get(
+                filtered_df, "aeroConfig", None
+            )
 
             self.flightEnvelope = FlightEnvelope(self)
             self.ARPM = ARPM(self)
@@ -4906,20 +4810,17 @@ class Bada3Aircraft(BADA3):
 
         else:
             # read BADA3 GPF file
-            GPFDataFrame = Parser.parseGPF(self.filePath, badaVersion)
+            GPFDataFrame = Parser.parseGPF(self.filePath)
 
             # check if SYNONYM file exist
-            synonymFile = os.path.join(
-                self.filePath, "BADA3", badaVersion, "SYNONYM.NEW"
-            )
-            synonymFileXML = os.path.join(
-                self.filePath, "BADA3", badaVersion, "SYNONYM.xml"
-            )
+            synonymFile = os.path.join(self.filePath, "SYNONYM.NEW")
+            synonymFileXML = os.path.join(self.filePath, "SYNONYM.xml")
+
             if os.path.isfile(synonymFile) or os.path.isfile(synonymFileXML):
                 self.synonymFileAvailable = True
 
                 self.SearchedACName = Parser.parseSynonym(
-                    self.filePath, badaVersion, acName
+                    self.filePath, acName
                 )
 
                 if self.SearchedACName == None:
@@ -4940,8 +4841,6 @@ class Bada3Aircraft(BADA3):
                 OPFfile = (
                     os.path.join(
                         self.filePath,
-                        "BADA3",
-                        badaVersion,
                         self.SearchedACName,
                     )
                     + ".OPF"
@@ -4949,8 +4848,6 @@ class Bada3Aircraft(BADA3):
                 APFfile = (
                     os.path.join(
                         self.filePath,
-                        "BADA3",
-                        badaVersion,
                         self.SearchedACName,
                     )
                     + ".APF"
@@ -4964,10 +4861,10 @@ class Bada3Aircraft(BADA3):
                     self.ACModelAvailable = True
 
                     OPFDataFrame = Parser.parseOPF(
-                        self.filePath, badaVersion, self.SearchedACName
+                        self.filePath, self.SearchedACName
                     )
                     APFDataFrame = Parser.parseAPF(
-                        self.filePath, badaVersion, self.SearchedACName
+                        self.filePath, self.SearchedACName
                     )
 
                     OPF_APF_combined_df = Parser.combineOPF_APF(
@@ -4977,89 +4874,119 @@ class Bada3Aircraft(BADA3):
                         OPF_APF_combined_df, GPFDataFrame
                     )
 
-                    self.acName = Parser.safe_get(combined_df, "acName", None)
-                    self.xmlFiles = Parser.safe_get(
+                    self.acName = configuration.safe_get(
+                        combined_df, "acName", None
+                    )
+                    self.xmlFiles = configuration.safe_get(
                         combined_df, "xmlFiles", None
                     )
 
-                    self.modificationDateOPF = Parser.safe_get(
+                    self.modificationDateOPF = configuration.safe_get(
                         combined_df, "modificationDateOPF", None
                     )
-                    self.modificationDateAPF = Parser.safe_get(
+                    self.modificationDateAPF = configuration.safe_get(
                         combined_df, "modificationDateAPF", None
                     )
 
-                    self.ICAO = Parser.safe_get(combined_df, "ICAO", None)
-                    self.numberOfEngines = Parser.safe_get(
+                    self.ICAO = configuration.safe_get(
+                        combined_df, "ICAO", None
+                    )
+                    self.numberOfEngines = configuration.safe_get(
                         combined_df, "numberOfEngines", None
                     )
-                    self.engineType = Parser.safe_get(
+                    self.engineType = configuration.safe_get(
                         combined_df, "engineType", None
                     )
-                    self.engines = Parser.safe_get(
+                    self.engines = configuration.safe_get(
                         combined_df, "engines", None
                     )
-                    self.WTC = Parser.safe_get(combined_df, "WTC", None)
-                    self.mass = Parser.safe_get(combined_df, "mass", None)
-
-                    self.MTOW = Parser.safe_get(combined_df, "MTOW", None)
-                    self.OEW = Parser.safe_get(combined_df, "OEW", None)
-                    self.MPL = Parser.safe_get(combined_df, "MPL", None)
-                    self.MREF = Parser.safe_get(combined_df, "MREF", None)
-                    self.VMO = Parser.safe_get(combined_df, "VMO", None)
-                    self.MMO = Parser.safe_get(combined_df, "MMO", None)
-                    self.hmo = Parser.safe_get(combined_df, "hmo", None)
-                    self.Hmax = Parser.safe_get(combined_df, "Hmax", None)
-                    self.tempGrad = Parser.safe_get(
+                    self.WTC = configuration.safe_get(combined_df, "WTC", None)
+                    self.mass = configuration.safe_get(
+                        combined_df, "mass", None
+                    )
+
+                    self.MTOW = configuration.safe_get(
+                        combined_df, "MTOW", None
+                    )
+                    self.OEW = configuration.safe_get(combined_df, "OEW", None)
+                    self.MPL = configuration.safe_get(combined_df, "MPL", None)
+                    self.MREF = configuration.safe_get(
+                        combined_df, "MREF", None
+                    )
+                    self.VMO = configuration.safe_get(combined_df, "VMO", None)
+                    self.MMO = configuration.safe_get(combined_df, "MMO", None)
+                    self.hmo = configuration.safe_get(combined_df, "hmo", None)
+                    self.Hmax = configuration.safe_get(
+                        combined_df, "Hmax", None
+                    )
+                    self.tempGrad = configuration.safe_get(
                         combined_df, "tempGrad", None
                     )
 
-                    self.S = Parser.safe_get(combined_df, "S", None)
-                    self.Clbo = Parser.safe_get(combined_df, "Clbo", None)
-                    self.k = Parser.safe_get(combined_df, "k", None)
-                    self.Vstall = Parser.safe_get(combined_df, "Vstall", None)
-                    self.CD0 = Parser.safe_get(combined_df, "CD0", None)
-                    self.CD2 = Parser.safe_get(combined_df, "CD2", None)
-                    self.HLids = Parser.safe_get(combined_df, "HLids", None)
-                    self.Ct = Parser.safe_get(combined_df, "Ct", None)
-                    self.CTdeslow = Parser.safe_get(
+                    self.S = configuration.safe_get(combined_df, "S", None)
+                    self.Clbo = configuration.safe_get(
+                        combined_df, "Clbo", None
+                    )
+                    self.k = configuration.safe_get(combined_df, "k", None)
+                    self.Vstall = configuration.safe_get(
+                        combined_df, "Vstall", None
+                    )
+                    self.CD0 = configuration.safe_get(combined_df, "CD0", None)
+                    self.CD2 = configuration.safe_get(combined_df, "CD2", None)
+                    self.HLids = configuration.safe_get(
+                        combined_df, "HLids", None
+                    )
+                    self.Ct = configuration.safe_get(combined_df, "Ct", None)
+                    self.CTdeslow = configuration.safe_get(
                         combined_df, "CTdeslow", None
                     )
-                    self.CTdeshigh = Parser.safe_get(
+                    self.CTdeshigh = configuration.safe_get(
                         combined_df, "CTdeshigh", None
                     )
-                    self.CTdesapp = Parser.safe_get(
+                    self.CTdesapp = configuration.safe_get(
                         combined_df, "CTdesapp", None
                     )
-                    self.CTdesld = Parser.safe_get(
+                    self.CTdesld = configuration.safe_get(
                         combined_df, "CTdesld", None
                     )
-                    self.HpDes = Parser.safe_get(combined_df, "HpDes", None)
-                    self.Cf = Parser.safe_get(combined_df, "Cf", None)
-                    self.CfDes = Parser.safe_get(combined_df, "CfDes", None)
-                    self.CfCrz = Parser.safe_get(combined_df, "CfCrz", None)
-                    self.TOL = Parser.safe_get(combined_df, "TOL", None)
-                    self.LDL = Parser.safe_get(combined_df, "LDL", None)
-                    self.span = Parser.safe_get(combined_df, "span", None)
-                    self.length = Parser.safe_get(combined_df, "length", None)
-
-                    self.V1 = Parser.safe_get(combined_df, "V1", None)
-                    self.V2 = Parser.safe_get(combined_df, "V2", None)
-                    self.M = Parser.safe_get(combined_df, "M", None)
-
-                    self.GPFdata = Parser.safe_get(
+                    self.HpDes = configuration.safe_get(
+                        combined_df, "HpDes", None
+                    )
+                    self.Cf = configuration.safe_get(combined_df, "Cf", None)
+                    self.CfDes = configuration.safe_get(
+                        combined_df, "CfDes", None
+                    )
+                    self.CfCrz = configuration.safe_get(
+                        combined_df, "CfCrz", None
+                    )
+                    self.TOL = configuration.safe_get(combined_df, "TOL", None)
+                    self.LDL = configuration.safe_get(combined_df, "LDL", None)
+                    self.span = configuration.safe_get(
+                        combined_df, "span", None
+                    )
+                    self.length = configuration.safe_get(
+                        combined_df, "length", None
+                    )
+
+                    self.V1 = configuration.safe_get(combined_df, "V1", None)
+                    self.V2 = configuration.safe_get(combined_df, "V2", None)
+                    self.M = configuration.safe_get(combined_df, "M", None)
+
+                    self.GPFdata = configuration.safe_get(
                         combined_df, "GPFdata", None
                     )
 
-                    self.drone = Parser.safe_get(combined_df, "drone", None)
+                    self.drone = configuration.safe_get(
+                        combined_df, "drone", None
+                    )
 
-                    self.DeltaCD = Parser.safe_get(
+                    self.DeltaCD = configuration.safe_get(
                         combined_df, "DeltaCD", None
                     )
-                    self.speedSchedule = Parser.safe_get(
+                    self.speedSchedule = configuration.safe_get(
                         combined_df, "speedSchedule", None
                     )
-                    self.aeroConfig = Parser.safe_get(
+                    self.aeroConfig = configuration.safe_get(
                         combined_df, "aeroConfig", None
                     )
 
@@ -5072,96 +4999,126 @@ class Bada3Aircraft(BADA3):
                     # search for xml files
 
                     XMLDataFrame = Parser.parseXML(
-                        self.filePath, badaVersion, self.SearchedACName
+                        self.filePath, self.SearchedACName
                     )
 
                     combined_df = Parser.combineACDATA_GPF(
                         XMLDataFrame, GPFDataFrame
                     )
 
-                    self.acName = Parser.safe_get(combined_df, "acName", None)
-                    self.xmlFiles = Parser.safe_get(
+                    self.acName = configuration.safe_get(
+                        combined_df, "acName", None
+                    )
+                    self.xmlFiles = configuration.safe_get(
                         combined_df, "xmlFiles", None
                     )
 
-                    self.modificationDateOPF = Parser.safe_get(
+                    self.modificationDateOPF = configuration.safe_get(
                         combined_df, "modificationDateOPF", None
                     )
-                    self.modificationDateAPF = Parser.safe_get(
+                    self.modificationDateAPF = configuration.safe_get(
                         combined_df, "modificationDateAPF", None
                     )
 
-                    self.ICAO = Parser.safe_get(combined_df, "ICAO", None)
-                    self.numberOfEngines = Parser.safe_get(
+                    self.ICAO = configuration.safe_get(
+                        combined_df, "ICAO", None
+                    )
+                    self.numberOfEngines = configuration.safe_get(
                         combined_df, "numberOfEngines", None
                     )
-                    self.engineType = Parser.safe_get(
+                    self.engineType = configuration.safe_get(
                         combined_df, "engineType", None
                     )
-                    self.engines = Parser.safe_get(
+                    self.engines = configuration.safe_get(
                         combined_df, "engines", None
                     )
-                    self.WTC = Parser.safe_get(combined_df, "WTC", None)
-                    self.mass = Parser.safe_get(combined_df, "mass", None)
-
-                    self.MTOW = Parser.safe_get(combined_df, "MTOW", None)
-                    self.OEW = Parser.safe_get(combined_df, "OEW", None)
-                    self.MPL = Parser.safe_get(combined_df, "MPL", None)
-                    self.MREF = Parser.safe_get(combined_df, "MREF", None)
-                    self.VMO = Parser.safe_get(combined_df, "VMO", None)
-                    self.MMO = Parser.safe_get(combined_df, "MMO", None)
-                    self.hmo = Parser.safe_get(combined_df, "hmo", None)
-                    self.Hmax = Parser.safe_get(combined_df, "Hmax", None)
-                    self.tempGrad = Parser.safe_get(
+                    self.WTC = configuration.safe_get(combined_df, "WTC", None)
+                    self.mass = configuration.safe_get(
+                        combined_df, "mass", None
+                    )
+
+                    self.MTOW = configuration.safe_get(
+                        combined_df, "MTOW", None
+                    )
+                    self.OEW = configuration.safe_get(combined_df, "OEW", None)
+                    self.MPL = configuration.safe_get(combined_df, "MPL", None)
+                    self.MREF = configuration.safe_get(
+                        combined_df, "MREF", None
+                    )
+                    self.VMO = configuration.safe_get(combined_df, "VMO", None)
+                    self.MMO = configuration.safe_get(combined_df, "MMO", None)
+                    self.hmo = configuration.safe_get(combined_df, "hmo", None)
+                    self.Hmax = configuration.safe_get(
+                        combined_df, "Hmax", None
+                    )
+                    self.tempGrad = configuration.safe_get(
                         combined_df, "tempGrad", None
                     )
 
-                    self.S = Parser.safe_get(combined_df, "S", None)
-                    self.Clbo = Parser.safe_get(combined_df, "Clbo", None)
-                    self.k = Parser.safe_get(combined_df, "k", None)
-                    self.Vstall = Parser.safe_get(combined_df, "Vstall", None)
-                    self.CD0 = Parser.safe_get(combined_df, "CD0", None)
-                    self.CD2 = Parser.safe_get(combined_df, "CD2", None)
-                    self.HLids = Parser.safe_get(combined_df, "HLids", None)
-                    self.Ct = Parser.safe_get(combined_df, "Ct", None)
-                    self.CTdeslow = Parser.safe_get(
+                    self.S = configuration.safe_get(combined_df, "S", None)
+                    self.Clbo = configuration.safe_get(
+                        combined_df, "Clbo", None
+                    )
+                    self.k = configuration.safe_get(combined_df, "k", None)
+                    self.Vstall = configuration.safe_get(
+                        combined_df, "Vstall", None
+                    )
+                    self.CD0 = configuration.safe_get(combined_df, "CD0", None)
+                    self.CD2 = configuration.safe_get(combined_df, "CD2", None)
+                    self.HLids = configuration.safe_get(
+                        combined_df, "HLids", None
+                    )
+                    self.Ct = configuration.safe_get(combined_df, "Ct", None)
+                    self.CTdeslow = configuration.safe_get(
                         combined_df, "CTdeslow", None
                     )
-                    self.CTdeshigh = Parser.safe_get(
+                    self.CTdeshigh = configuration.safe_get(
                         combined_df, "CTdeshigh", None
                     )
-                    self.CTdesapp = Parser.safe_get(
+                    self.CTdesapp = configuration.safe_get(
                         combined_df, "CTdesapp", None
                     )
-                    self.CTdesld = Parser.safe_get(
+                    self.CTdesld = configuration.safe_get(
                         combined_df, "CTdesld", None
                     )
-                    self.HpDes = Parser.safe_get(combined_df, "HpDes", None)
-                    self.Cf = Parser.safe_get(combined_df, "Cf", None)
-                    self.CfDes = Parser.safe_get(combined_df, "CfDes", None)
-                    self.CfCrz = Parser.safe_get(combined_df, "CfCrz", None)
-                    self.TOL = Parser.safe_get(combined_df, "TOL", None)
-                    self.LDL = Parser.safe_get(combined_df, "LDL", None)
-                    self.span = Parser.safe_get(combined_df, "span", None)
-                    self.length = Parser.safe_get(combined_df, "length", None)
-
-                    self.V1 = Parser.safe_get(combined_df, "V1", None)
-                    self.V2 = Parser.safe_get(combined_df, "V2", None)
-                    self.M = Parser.safe_get(combined_df, "M", None)
-
-                    self.GPFdata = Parser.safe_get(
+                    self.HpDes = configuration.safe_get(
+                        combined_df, "HpDes", None
+                    )
+                    self.Cf = configuration.safe_get(combined_df, "Cf", None)
+                    self.CfDes = configuration.safe_get(
+                        combined_df, "CfDes", None
+                    )
+                    self.CfCrz = configuration.safe_get(
+                        combined_df, "CfCrz", None
+                    )
+                    self.TOL = configuration.safe_get(combined_df, "TOL", None)
+                    self.LDL = configuration.safe_get(combined_df, "LDL", None)
+                    self.span = configuration.safe_get(
+                        combined_df, "span", None
+                    )
+                    self.length = configuration.safe_get(
+                        combined_df, "length", None
+                    )
+
+                    self.V1 = configuration.safe_get(combined_df, "V1", None)
+                    self.V2 = configuration.safe_get(combined_df, "V2", None)
+                    self.M = configuration.safe_get(combined_df, "M", None)
+
+                    self.GPFdata = configuration.safe_get(
                         combined_df, "GPFdata", None
                     )
 
-                    self.drone = Parser.safe_get(combined_df, "drone", None)
+                    self.drone = configuration.safe_get(
+                        combined_df, "drone", None
+                    )
 
-                    self.DeltaCD = Parser.safe_get(
+                    self.DeltaCD = configuration.safe_get(
                         combined_df, "DeltaCD", None
                     )
-                    self.speedSchedule = Parser.safe_get(
+                    self.speedSchedule = configuration.safe_get(
                         combined_df, "speedSchedule", None
                     )
-                    self.aeroConfig = Parser.safe_get(
+                    self.aeroConfig = configuration.safe_get(
                         combined_df, "aeroConfig", None
                     )