digichem-core 6.10.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

digichem/__init__.py

@@ -20,7 +20,7 @@ from digichem.datas import get_resource
 # development = prerelease is not None
 # # The full version number of this package.
 # __version__ = "{}.{}.{}{}".format(major_version, minor_version, revision, "-pre.{}".format(prerelease) if development else "")
-__version__ = "6.10.1"
+__version__ = "7.0.0"
 _v_parts = __version__.split("-")[0].split(".")
 major_version = int(_v_parts[0])
 minor_version = int(_v_parts[1])
@@ -39,7 +39,7 @@ __author__ = [
 ]
 
 # Program date (when we were last updated). This is changed automatically.
-_last_updated_string = "28/05/2025"
+_last_updated_string = "30/09/2025"
 last_updated = datetime.strptime(_last_updated_string, "%d/%m/%Y")
 
 # The sys attribute 'frozen' is our flag, '_MEIPASS' is the dir location.

digichem/config/base.py

@@ -35,6 +35,11 @@ class Digichem_options(Configurable):
         cubegen = Option(help = "Gaussian's cubegen utility https://gaussian.com/cubegen/", default = "cubegen"),
         cubegen_parallel = Option(help = "What type of parallelism to use with cubegen, multithreaded runs a single instance of cubegen across multiple CPUs, pool runs multiple instances of cubegen", choices = [None, "multithreaded", "pool"], default = "pool")
     )
+
+    parse = Options(
+        help = "Options for controlling parsing of config files",
+        profiling_rows = Option(help = "The maximum number of rows to parse from the calculation profile file (if available); if more rows than this are available then the data will be downsampled to at most this number of data points", type = int, default = 1000)
+    )
     
     skeletal_image = Options(
         help = "Options for controlling the rendering of 2D skeletal images.",
@@ -72,7 +77,7 @@ Possible options are:
         ),
         batoms = Options(help = "Beautiful Atoms/Blender specific options (only applies if engine == 'batoms'",
             blender = Option(help = "Path to the blender executable, in which beautiful atoms should be installed", default = "batoms-blender"),
-            cpus = Option(help = "The number of CPUs/threads to use. This option is overridden if running in a calculation environemnt (where it uses the same number of CPUs as the calculation did)", type = int, default = 1),
+            cpus = Option(help = "The number of CPUs/threads to use. This option is overridden if running in a calculation environment (where it uses the same number of CPUs as the calculation did)", type = int, default = 1),
             render_samples = Option(help = "The number of render samples (or passes) to use. Higher values result in higher image quality and greater render times", type = int, default = 32),
             perspective = Option(help = "The perspective mode", choices = ["orthographic", "perspective"], default = "perspective"),
             stacking = Option(help = "The number of image copies to composite together to avoid transparency artifacts", type = int, default = 10)
@@ -172,6 +177,7 @@ To disable the maximum width, set to null.""", type = int, default = 1200
 Set to 0 for no cutoff (all peaks shown), which may results in the graph being extended well beyond the drawn peaks (because many peaks are too small to see).
 This option has no effect when using manual x limits.""", type = float, default = 0.01
         ),
+        y_filter = Option(help = "The minimum y value to simulate using the Gaussian function (y values below this are discarded)", type = float, default = 1e-6),
         x_padding = Option(help = "The amount (in nm) to extend the x axis past the highest/lowest energy peak.", type = int, default = 40),
         fwhm = Option(help = "The full-width at half-maximum; changes how wide the drawn peaks are. Note that the choice of peak width is essentially arbitrary; only the peak height is given by calculation. Units are eV.", type = float, default = 0.4),
         gaussian_cutoff = Option(help = "The minimum y value to plot using the Gaussian function (controls how close to the x axis we draw the gaussian) as a fraction of the max peak height.", type = float, default = 0.001),
@@ -202,10 +208,11 @@ Absorption graphs will grow/shrink their width to fit available data, keeping a
 To disable the maximum width, set to null.""", type = int, default = 1200
         ),
         peak_cutoff = Option(help =\
-"""The minimum oscillator strength that a peak must have to be shown in the graph, as a fraction ofthe highest peak.
+"""The minimum oscillator strength that a peak must have to be shown in the graph, as a fraction of the highest peak.
 Set to 0 for no cutoff (all peaks shown), which may results in the graph being extended well beyond the drawn peaks (because many peaks are too small to see).
 This option has no effect when using manual x limits.""", type = float, default = 0.01
         ),
+        y_filter = Option(help = "The minimum y value to simulate using the Gaussian function (y values below this are discarded)", type = float, default = 1e-6),
         x_padding = Option(help = "The amount (in nm) to extend the x axis past the highest/lowest energy peak.", type = int, default = 40),
         fwhm = Option(help = "The full-width at half-maximum; changes how wide the drawn peaks are. Note that the choice of peak width is essentially arbitrary; only the peak height is given by calculation. Units are eV.", type = float, default = 0.4),
         gaussian_cutoff = Option(help = "The minimum y value to plot using the Gaussian function (controls how close to the x axis we draw the gaussian) as a fraction of the max peak height.", type = float, default = 0.001),
@@ -235,6 +242,7 @@ Possible options are:
 """The maximum image width in pixels.
 IR spectra will grow/shrink their width to fit available data, keeping a constant scale (constant pixels to nm ratio) but only up to this maximum.
 To disable the maximum width, set to null.""", type = int, default = 1500),
+        y_filter = Option(help = "The minimum y value to simulate using the Gaussian function (y values below this are discarded)", type = float, default = 1e-6),
         gaussian_cutoff = Option(help = "The minimum y value to plot using the Gaussian function (controls how close to the x axis we draw the gaussian) as a fraction of the max peak height.", type = float, default = 0.001),
         gaussian_resolution = Option(help = "The spacing between x values to plot using the Gaussian function, in eV. Values that are too large will result in 'curves' made up of a series of straight edges.", type = float, default = 1.0)
     )
@@ -243,6 +251,7 @@ To disable the maximum width, set to null.""", type = int, default = 1500),
         enable_rendering = Option(help = "Set to False to disable image rendering.", type = bool, default = True),
         coupling_filter = Option(help = "Discard J coupling that is below this threshold (in Hz)", type = float, default = 1),
         fwhm = Option(help = "The full-width at half-maximum; changes how wide the drawn peaks are. Note that the choice of peak width is essentially arbitrary; only the peak height is given by calculation. Units are ppm.", type = float, default = 0.01),
+        y_filter = Option(help = "The minimum y value to simulate using the Gaussian function (y values below this are discarded)", type = float, default = 1e-6),
         gaussian_cutoff = Option(help = "The minimum y value to plot using the Gaussian function (controls how close to the x axis we draw the gaussian) as a fraction of the max peak height.", type = float, default = 0.001),
         gaussian_resolution = Option(help = "The spacing between x values to plot using the Gaussian function, in ppm. Values that are too large will result in 'curves' made up of a series of straight edges.", type = float, default = 0.001),
         frequency = Option(help = "The frequency to run the simulated spectrometer at. Larger values will result in narrower coupling. Units are MHz", type = float, default = 100),

digichem/config/util.py

@@ -40,8 +40,9 @@ def get_config(
         :param sources: An iterable of file locations to read from.
         :return: A Digichem_options object (a fancy dict).
         """
+        global _options
         if clear_cache:
-            globals()['_options'] = None
+            _options = None
 
         if _options is not None and extra_config_files is None and extra_config_strings is None:
             # Config has already been loaded (and we have nothing new to add).
@@ -63,7 +64,7 @@ def get_config(
                 #  config.merge(Config_file_parser(source).load(True))
             
             # No need to validate here, we're going to do it later anyway.
-            globals()['_options'] = cls(validate_now = False, **config)
+            _options = cls(validate_now = False, **config)
         
         if extra_config_files is None:
             extra_config_files = []

digichem/file/prattle.py

@@ -37,7 +37,7 @@ class Openprattle_converter():
         :param executable: Path or command name to the oprattle executable.
         """
         self.input_file = input_file
-        self.input_file_buffer = input_file_buffer
+        self.input_file_buffer = input_file_buffer if input_file is None else input_file.read()
         self.input_file_path = input_file_path
         self.input_file_type = input_file_type
         self.executable = executable
@@ -128,7 +128,7 @@ class Openprattle_converter():
         ]
         
         # Add the input path if we're reading from file.
-        if self.input_file is None:
+        if self.input_file_buffer is None:
             sig.append(str(self.input_file_path))
             
         # Now add the input and output switches.
@@ -152,7 +152,11 @@ class Openprattle_converter():
             sig.extend(['-O', output_file])
         
         # Give our input_file as stdin if we're not reading from file.
-        inputs = self.input_file        
+        inputs = self.input_file_buffer
+
+        # Encode strings.
+        if isinstance(inputs, str):
+            inputs = inputs.encode()
         
         # GO.
         done_process = subprocess.run(
@@ -160,18 +164,16 @@ class Openprattle_converter():
             input = inputs,
             stdout = subprocess.PIPE,
             stderr = subprocess.PIPE,
-            # TODO: Using universal newlines is probably not safe here; some formats are binary (.cdx etc...)
-            universal_newlines = True,
         )
 
         # This can throw exceptions.
-        self.handle_logging(done_process.stderr)
+        self.handle_logging(done_process.stderr.decode())
 
         if done_process.returncode != 0:
             raise Digichem_exception("prattle subprocess returned code {}".format(done_process.returncode))
         
         # Return our output.
-        return done_process.stdout if output_file is None else None
+        return done_process.stdout.decode() if output_file is None else None
     
     def handle_logging(self, raw_output):
         """

digichem/image/render.py

@@ -247,7 +247,6 @@ class Batoms_renderer(Render_maker):
             # "--render-samples", f"{samples}",
             "--perspective", f"{self.perspective}",
             "--padding", f"{padding}",
-            "--rotations",
         ]
         for orientation, resolution, samples, mini_file_name in targets:
             args.extend([
@@ -258,9 +257,12 @@ class Batoms_renderer(Render_maker):
                 mini_file_name
             ])
 
-        # Add rotations.
-        for rotation in self.rotations:
-            args.append(json.dumps(rotation))
+        if len(self.rotations) > 0:
+            args.append("--rotations")
+
+            # Add rotations.
+            for rotation in self.rotations:
+                args.append(json.dumps(rotation))
         
         return args
     

digichem/image/spectroscopy.py

@@ -256,8 +256,15 @@ class Absorption_emission_graph_maker(Spectroscopy_graph_maker):
         """    
         return self(
             output,
-            Absorption_emission_graph.from_excited_states(excited_states, options[self.options_name]['fwhm'], options[self.options_name]['gaussian_resolution'], options[self.options_name]['gaussian_cutoff'], use_jacobian = options[self.options_name]['use_jacobian'], adjust_zero = adjust_zero),
-            **{key: value for key, value in options[self.options_name].items() if key not in ["gaussian_cutoff", "gaussian_resolution", "fwhm", "use_jacobian"]},
+            Absorption_emission_graph.from_excited_states(
+                excited_states,
+                options[self.options_name]['fwhm'],
+                options[self.options_name]['gaussian_resolution'],
+                options[self.options_name]['gaussian_cutoff'],
+                use_jacobian = options[self.options_name]['use_jacobian'],
+                filter = options[self.options_name]['y_filter'],
+                adjust_zero = adjust_zero),
+            **{key: value for key, value in options[self.options_name].items() if key not in ["gaussian_cutoff", "gaussian_resolution", "fwhm", "use_jacobian", "y_filter"]},
             **kwargs
         )
     
@@ -332,8 +339,14 @@ class Frequency_graph_maker(Spectroscopy_graph_maker):
         """        
         return self(
             output,
-            graph = Spectroscopy_graph.from_vibrations(vibrations, options['IR_spectrum']['fwhm'], options['IR_spectrum']['gaussian_resolution'], options['IR_spectrum']['gaussian_cutoff']),
-            **{key: value for key, value in options['IR_spectrum'].items() if key not in ["gaussian_cutoff", "gaussian_resolution", "fwhm"]},
+            graph = Spectroscopy_graph.from_vibrations(
+                vibrations,
+                options['IR_spectrum']['fwhm'],
+                options['IR_spectrum']['gaussian_resolution'],
+                options['IR_spectrum']['gaussian_cutoff'],
+                filter = options['IR_spectrum']['y_filter']
+            ),
+            **{key: value for key, value in options['IR_spectrum'].items() if key not in ["gaussian_cutoff", "gaussian_resolution", "fwhm", "y_filter"]},
             **kwargs
         )
 

digichem/input/__init__.py

@@ -1,3 +1,3 @@
 from .base import Input_file
 from .gaussian import Gaussian_input_parser
-from .digichem_input import Digichem_coords_ABC, Digichem_coords, si_from_yaml, si_from_file
+from .digichem_input import Digichem_coords_ABC, Digichem_coords, si_from_yaml, si_from_file, si_from_data

digichem/input/digichem_input.py

@@ -211,7 +211,7 @@ class Digichem_coords_ABC(Input_file, Molecule_mixin):
             # Convert.
             charge = self.charge if self.charge is not None else None
             multiplicity = self.multiplicity if self.multiplicity is not None else None
-            return Openprattle_converter(input_file = self.xyz, input_file_path = self.implicit_name, input_file_type = "xyz").convert(file_type, file, charge = charge, multiplicity = multiplicity)
+            return Openprattle_converter(input_file_buffer = self.xyz, input_file_path = self.implicit_name, input_file_type = "xyz").convert(file_type, file, charge = charge, multiplicity = multiplicity)
 
     @classmethod
     def input_formats(self):
@@ -416,6 +416,38 @@ def si_from_yaml(yaml_dict, file_name = None, **kwargs):
     return cls.from_yaml(yaml_dict, file_name, **kwargs)
 
 
+def si_from_data(data, file_type, *, gen3D = None, file_name = None, **kwargs):
+    """
+    """
+    if file_type in ["com", "gau", "gjc", "gjf"]:
+        # Gaussian input format.
+        return Digichem_coords.from_com(data, file_name = file_name, **kwargs)
+
+    elif file_type == "si":
+        # Digichem input format.
+        return si_from_yaml(yaml.safe_load(data), file_name = file_name, **kwargs)
+        
+    elif file_type == "pickle":
+        # A digichem resume file.
+        # The resume file (should be) a pickled destination object.
+        try:
+            destination = dill.loads(data)
+        
+        except Exception as e:
+            raise Digichem_exception("Failed to parse digichem resume file") from e
+        
+        return destination.program.calculation.input_coords
+    
+    else:
+        # Generic input format, use obabel.
+        
+        # We convert all formats to gaussian input formats (because this format contains charge and multiplicity, which we can extract).
+        com_file = Openprattle_converter(input_file_buffer = data, input_file_type = file_type).convert("com", gen3D = gen3D)
+    
+        # Continue with other constructors.
+        return Digichem_coords.from_com(com_file, file_name = file_name, **kwargs)
+
+
 def si_from_file(file_name, file_type = None, *, gen3D = None, **kwargs):
         """
         Create a Digichem_coords object from a file in arbitrary format.
@@ -436,32 +468,10 @@ def si_from_file(file_name, file_type = None, *, gen3D = None, **kwargs):
                 auto_file_type = True
                 file_type = Openprattle_converter.type_from_file_name(file_name, allow_none = True)
                     
-            # Certain formats we support natively; others we convert to an intermediate format.
-            if file_type in ["com", "gau", "gjc", "gjf"]:
-                # Gaussian input format.
-                with open(file_name, "rt") as com_file:
-                    return Digichem_coords.from_com(com_file.read(), file_name = file_name, **kwargs)
-    
-            elif file_type == "si":
-                # Digichem input format.
-                with open(file_name, "rt") as si_file:
-                    return si_from_yaml(yaml.safe_load(si_file.read()), file_name = file_name, **kwargs)
-                
-            elif file_type == "pickle":
-                # A digichem resume file.
-                # The resume file (should be) a pickled destination object.
-                with open(file_name, "rb") as pickle_file:
-                    try:
-                        destination = dill.load(pickle_file)
-                    
-                    except Exception as e:
-                        raise Digichem_exception("Failed to parse digichem resume file") from e
-                    
-                    return destination.program.calculation.input_coords
-                
+            # Certain formats we support natively; others we convert to an intermediate format.                
             # NOTE: Here we assume files without an extension are log files.
             # This works fine for directories, but might change in future.
-            elif file_type in ["dat", "log", "out", "output", None] \
+            if file_type in ["dat", "log", "out", "output", None] \
                 or (auto_file_type and "".join(file_name.suffixes) in open_for_parsing.get_archive_formats()):
                 # Generic log-file (output) format.
                 # Most formats (.log, .dat etc) we can parse with either Obabel or Digichem.
@@ -476,24 +486,19 @@ def si_from_file(file_name, file_type = None, *, gen3D = None, **kwargs):
                 except Exception as e:
                     # No good, see if we can use obabel.
                     try:
-                        com_file = Openprattle_converter.from_file(file_name, file_type).convert("com", gen3D = gen3D)
+                        com_file = Openprattle_converter(file_name, file_type).convert("com", gen3D = gen3D)
                     
                     except Exception:
                         # Also no good, re-raise original exception.
-                        raise
+                        raise e
                     
                     # Worked with fallback, log a message.
                     digichem.log.get_logger().warning(f"Failed to parse calculation output file '{file_name}'; using Obabel fallback mechanism")
                     return Digichem_coords.from_com(com_file, file_name = file_name, **kwargs)
                 
             else:
-                # Generic input format, use obabel.
-                
-                # We convert all formats to gaussian input formats (because this format contains charge and multiplicity, which we can extract).
-                com_file = Openprattle_converter.from_file(file_name, file_type).convert("com", gen3D = gen3D)         
-            
-                # Continue with other constructors.
-                return Digichem_coords.from_com(com_file, file_name = file_name, **kwargs)
+                with open(file_name, "rb" if file_type in ["pickle", "cdx"] else "r") as input_file:
+                    return si_from_data(input_file.read(), file_name = file_name, gen3D = gen3D, file_type = file_type, **kwargs)
             
         except:
             raise ValueError("Could not parse coordinates from '{}'".format(file_name))

digichem/misc/io.py

@@ -6,6 +6,7 @@ import os
 import shutil
 import sys
 import warnings
+import itertools
 from uuid import uuid4
 import hashlib
 
@@ -320,3 +321,13 @@ class Safe_path():
         """
         # Close our file.
         self.close()
+
+def dir_size(target):
+    """
+    Calculate the total used file space of a directory and all contents.
+    """
+    bytes = 0
+    for path in itertools.chain(Path(target).rglob("*"), [Path(target)]):
+        bytes += path.stat().st_size
+    
+    return bytes

digichem/parse/base.py

@@ -32,7 +32,7 @@ custom_parsing_formats = [
 class Parser_abc():
     """ABC for all parsers."""
 
-    def __init__(self, *, raw_data = None, **kwargs):
+    def __init__(self, *, raw_data = None, options, **kwargs):
         """
         Top level constructor for calculation parsers.
         """
@@ -41,6 +41,9 @@ class Parser_abc():
         
         # A result set object that we'll populate with results.
         self.results = None
+
+        # Config options.
+        self.options = options
         
         # Parse (if we haven't already).
         try:
@@ -100,24 +103,23 @@ class Parser_abc():
         # TODO: It would probably be better if we used the name of the user who owns the output file, rather than the current user...
         self.data.metadata['user'] = self.get_current_username()
             
-    def process_all(self, options):
+    def process_all(self):
         """
         Get all the Result set objects produced by this parser.
         
         :param options: A Digichem options nested dictionary containing options to control parsing.
         :return: A list of the populated result sets.
         """
-        self.process(options)
+        self.process()
         return [self.results]
     
-    def process(self, options):
+    def process(self):
         """
         Get a Result set object from this parser.
         
         :param options: A Digichem options nested dictionary containing options to control parsing.
         :return: The populated result set.
         """
-        self.options = options
         # Get our result set.
         self.results = Result_set(
             _id = self.data._id,
@@ -125,7 +127,7 @@ class Parser_abc():
             aux = self.data._aux if hasattr(self.data, '_aux') else None
             )
         
-        alignment_class = Alignment.from_class_handle(options['alignment']) if options['alignment'] is not None else Minimal
+        alignment_class = Alignment.from_class_handle(self.options['alignment']) if self.options['alignment'] is not None else Minimal
         
         # First get our list of MOs (because we need them for excited states too.)
         self.results.orbitals = Molecular_orbital_list.from_parser(self)

digichem/parse/cclib.py

@@ -22,7 +22,7 @@ class Cclib_parser(File_parser_abc):
     # A dictionary of recognised auxiliary file types.
     INPUT_FILE_TYPES = {}
     
-    def __init__(self, *log_files, **auxiliary_files):
+    def __init__(self, *log_files, options, **auxiliary_files):
         """
         Top level constructor for calculation parsers.
         
@@ -36,10 +36,10 @@ class Cclib_parser(File_parser_abc):
         # Also have a look for a profile.csv file that we can us for performance metrics.
         self.profile_file = Path(log_files[0].parent, "../Logs/profile.csv")
         
-        super().__init__(*log_files)
+        super().__init__(*log_files, options = options)
         
     @classmethod
-    def from_logs(self, *log_files, hints = None, **kwargs):
+    def from_logs(self, *log_files, hints = None, options, **kwargs):
         """
         Intelligent constructor that will attempt to guess the location of files from a given log file(s).
         
@@ -56,7 +56,7 @@ class Cclib_parser(File_parser_abc):
         # Finally, update our auxiliary_files with kwargs, so any user specified aux files take precedence.
         auxiliary_files.update(kwargs)
         
-        return self(*log_files, **auxiliary_files)
+        return self(*log_files, options = options, **auxiliary_files)
     
     @classmethod
     def find_auxiliary_files(self, hint, basename):
@@ -127,7 +127,11 @@ class Cclib_parser(File_parser_abc):
             self.parse_profile_file()
         
         except Exception:
-            digichem.log.get_logger().warning("Could not parse profile.csv file; profiling data will be unavailable", exc_info=True)
+            if self.profile_file.exists():
+                digichem.log.get_logger().warning("Could not parse profile.csv file; profiling data will be unavailable", exc_info=True)
+            
+            else:
+                pass
 
     def parse_profile_file(self):
         """
@@ -146,7 +150,7 @@ class Cclib_parser(File_parser_abc):
         if lines < 2:
             return
 
-        max_lines  = 1000
+        max_lines  = self.options.parse['profiling_rows']
         factor = math.ceil(lines / max_lines)
         
         with open(self.profile_file) as profile_file:
@@ -156,15 +160,49 @@ class Cclib_parser(File_parser_abc):
             headers = next(reader)
 
             # Check headers match.
-            if (headers[0] != "Duration / s" or 
-               headers[1] != "Memory Used (Real) / bytes" or
-               headers[2] != "Memory Used (Real) / %" or
-               headers[3] != "Memory Available  (Real) / bytes" or
-               headers[4] != "Memory Available (Real) / %" or
-               headers[9] != "CPU Usage / %" or
-               headers[15] != "Output Directory Available / bytes" or
-               headers[17] != "Scratch Directory Available / bytes"
+            if (headers[0] == "Duration / s" and 
+               headers[1] == "Memory Used (Real) / bytes" and
+               headers[2] == "Memory Used (Real) / %" and
+               headers[3] == "Memory Available  (Real) / bytes" and
+               headers[4] == "Memory Available (Real) / %" and
+               headers[9] == "CPU Usage / %" and
+               headers[15] == "Output Directory Available / bytes" and
+               headers[17] == "Scratch Directory Used / bytes" and
+               headers[18] == "Scratch Directory Available / bytes"
+            ):
+                column_map = {
+                    "duration": 0,
+                    "memory_used": 1,
+                    "memory_used_percent": 2,
+                    "memory_available": 3,
+                    "memory_available_percent": 4,
+                    "cpu_used": 9,
+                    "output_available": 15,
+                    "scratch_used": 17,
+                    "scratch_available": 18
+                }
+            
+            elif (headers[0] == "Duration / s" and 
+               headers[1] == "Memory Used (Real) / bytes" and
+               headers[2] == "Memory Used (Real) / %" and
+               headers[3] == "Memory Available  (Real) / bytes" and
+               headers[4] == "Memory Available (Real) / %" and
+               headers[9] == "CPU Usage / %" and
+               headers[15] == "Output Directory Available / bytes" and
+               headers[17] == "Scratch Directory Available / bytes"
             ):
+                column_map = {
+                    "duration": 0,
+                    "memory_used": 1,
+                    "memory_used_percent": 2,
+                    "memory_available": 3,
+                    "memory_available_percent": 4,
+                    "cpu_used": 9,
+                    "output_available": 15,
+                    "scratch_available": 17
+                }
+            
+            else:
                 raise Digichem_exception("wrong headers found in profile.csv file")
             
             # Then the body.
@@ -185,17 +223,19 @@ class Cclib_parser(File_parser_abc):
         # - cpu used
         # - output space
         # - scratch space
-        new_data = numpy.zeros((math.ceil(lines / factor), 8))
+        new_data = numpy.zeros((math.ceil(lines / factor), len(column_map)))
 
         # Now decimate.
-        for i, k in enumerate([0,1,2,3,4,9,15,17]):
+        for i, k in enumerate(column_map.values()):
             if factor > 1:
                 new_data[:, i] = signal.decimate(data[:, k], factor)
             else:
                 new_data[:, i] = data[:, k]
         
         
-        self.data.metadata['performance'] = new_data
+        self.data.metadata['performance'] = {
+            key: new_data[:, index] for index, key in enumerate(column_map)
+        }
         
         
     def parse_output_line(self, log_file, line):