gammasimtools 0.5.1__py3-none-any.whl → 0.6.1__py3-none-any.whl

simtools/corsika/corsika_histograms.py

@@ -1,24 +1,25 @@
 import functools
 import logging
 import operator
+import re
 import time
 from pathlib import Path
 
 import boost_histogram as bh
 import numpy as np
 from astropy import units as u
-from astropy.table import QTable
+from astropy.io.misc import yaml
 from astropy.units import cds
 from corsikaio.subblocks import event_header, get_units_from_fields, run_header
+from ctapipe.io import write_table
 from eventio import IACTFile
 
-from simtools import io_handler, version
-from simtools.utils.general import (
-    collect_data_from_yaml_or_dict,
-    convert_2D_to_radial_distr,
-    rotate,
-    save_dict_to_file,
-)
+from simtools import version
+from simtools.io_operations import io_handler
+from simtools.io_operations.hdf5_handler import fill_hdf5_table
+from simtools.utils.general import collect_data_from_file_or_dict
+from simtools.utils.geometry import convert_2d_to_radial_distr, rotate
+from simtools.utils.names import sanitize_name
 
 
 class HistogramNotCreated(Exception):
@@ -37,6 +38,8 @@ class CorsikaHistograms:
         Instance label.
     output_path: str
         Path where to save the output of the class methods.
+    hdf5_file_name: str
+        HDF5 file name for histogram storage.
 
     Raises
     ------
@@ -44,7 +47,7 @@ class CorsikaHistograms:
         if the input file given does not exist.
     """
 
-    def __init__(self, input_file, label=None, output_path=None):
+    def __init__(self, input_file, label=None, output_path=None, hdf5_file_name=None):
         self.label = label
         self._logger = logging.getLogger(__name__)
         self._logger.debug("Init CorsikaHistograms")
@@ -58,18 +61,17 @@ class CorsikaHistograms:
 
         self.io_handler = io_handler.IOHandler()
         _default_output_path = self.io_handler.get_output_directory(self.label, "corsika")
+
         if output_path is None:
             self.output_path = _default_output_path
         else:
             self.output_path = Path(output_path)
-        self._initialize_attributes()
-        self.read_event_information()
-        self._initialize_header()
 
-    def _initialize_attributes(self):
-        """
-        Initializes the class attributes.
-        """
+        if hdf5_file_name is None:
+            self.hdf5_file_name = re.split(r"\.", self.input_file.name)[0] + ".hdf5"
+        else:
+            self.hdf5_file_name = hdf5_file_name
+
         self._telescope_indices = None
         self._telescope_positions = None
         self.num_events = None
@@ -79,8 +81,8 @@ class CorsikaHistograms:
         self._num_photons_per_event = None
         self._num_photons_per_telescope = None
         self.__meta_dict = None
-        self.__dict_2D_distributions = None
-        self.__dict_1D_distributions = None
+        self._dict_2d_distributions = None
+        self._dict_1d_distributions = None
         self._event_azimuth_angles = None
         self._event_zenith_angles = None
         self._hist_config = None
@@ -93,9 +95,36 @@ class CorsikaHistograms:
         self.event_information = None
         self._individual_telescopes = None
         self._allowed_histograms = {"hist_position", "hist_direction", "hist_time_altitude"}
-        self._allowed_1D_labels = {"wavelength", "time", "altitude"}
-        self._allowed_2D_labels = {"counts", "density", "direction", "time_altitude"}
+        self._allowed_1d_labels = {"wavelength", "time", "altitude"}
+        self._allowed_2d_labels = {"counts", "density", "direction", "time_altitude"}
         self._header = None
+        self.hist_position = None
+        self.hist_direction = None
+        self.hist_time_altitude = None
+
+        self.read_event_information()
+        self._initialize_header()
+
+    @property
+    def hdf5_file_name(self):
+        """
+        Property for the hdf5 file name.
+        The idea of this property is to allow setting (or changing) the name of the hdf5 file
+         even after creating the class instance.
+        """
+        return self._hdf5_file_name
+
+    @hdf5_file_name.setter
+    def hdf5_file_name(self, hdf5_file_name):
+        """
+        Sets the hdf5_file_name to the argument passed.
+
+        Parameters
+        ----------
+        hdf5_file_name: str
+            The name of hdf5 file to be set.
+        """
+        self._hdf5_file_name = Path(self.output_path).joinpath(hdf5_file_name).absolute().as_posix()
 
     @property
     def corsika_version(self):
@@ -193,7 +222,7 @@ class CorsikaHistograms:
                     self.all_event_keys, all_event_units
                 )
 
-                # Add the unities to dictionary with the parameters and turn it into
+                # Add the units to dictionary with the parameters and turn it into
                 # astropy.Quantities.
                 for i_key, key in enumerate(self.all_event_keys[1:]):  # starting at the second
                     # element to avoid the non-numeric (e.g. 'EVTH') key.
@@ -315,7 +344,7 @@ class CorsikaHistograms:
             input_dict = input_config
         else:
             input_yaml = input_config
-        self._hist_config = collect_data_from_yaml_or_dict(input_yaml, input_dict, allow_empty=True)
+        self._hist_config = collect_data_from_file_or_dict(input_yaml, input_dict, allow_empty=True)
 
     def hist_config_to_yaml(self, file_name=None):
         """
@@ -331,8 +360,9 @@ class CorsikaHistograms:
         if file_name is None:
             file_name = "hist_config"
         file_name = Path(file_name).with_suffix(".yml")
-        output_config_file = Path(self.output_path).joinpath(file_name)
-        save_dict_to_file(self.hist_config, output_config_file)
+        output_config_file_name = Path(self.output_path).joinpath(file_name)
+        with open(output_config_file_name, "w", encoding="utf-8") as file:
+            yaml.dump(self.hist_config, file)
 
     def _create_histogram_default_config(self):
         """
@@ -510,9 +540,9 @@ class CorsikaHistograms:
              of the Cherenkov photons on the ground are saved:
              x: x position on the ground (CORSIKA coordinate system),
              y: y position on the ground (CORSIKA coordinate system),
-             cx: direction cosinus in the x direction, i.e., the cosinus of the angle between the
+             cx: direction cosine in the x direction, i.e., the cosine of the angle between the
              incoming direction and the x axis,
-             cy: direction cosinus in the y direction, i.e., the cosinus of the angle between the
+             cy: direction cosine in the y direction, i.e., the cosine of the angle between the
              incoming direction and the y axis,
              time: time of arrival of the photon in ns. The clock starts when the particle crosses
              the top of the atmosphere (CORSIKA-defined) if `self.event_first_interaction_heights`
@@ -605,7 +635,7 @@ class CorsikaHistograms:
 
         num_photons_per_event_per_telescope_to_set = []
         start_time = time.time()
-        self._logger.debug("Starting reading the file at {}.".format(start_time))
+        self._logger.debug(f"Starting reading the file at {start_time}.")
         with IACTFile(self.input_file) as f:
             event_counter = 0
             for event in f:
@@ -667,7 +697,7 @@ class CorsikaHistograms:
         """
 
         for histogram in self._allowed_histograms:
-            if not hasattr(self, histogram):
+            if not hasattr(self, histogram) or getattr(self, histogram) is None:
                 msg = (
                     "The histograms were not created. Please, use `create_histograms` to create "
                     "histograms from the CORSIKA output file."
@@ -675,7 +705,7 @@ class CorsikaHistograms:
                 self._logger.error(msg)
                 raise HistogramNotCreated
 
-    def _get_hist_2D_projection(self, label):
+    def _get_hist_2d_projection(self, label):
         """
         Helper function to get 2D distributions.
 
@@ -689,9 +719,9 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The x edges of the histograms.
+            The x bin edges of the histograms.
         numpy.array
-            The y edges of the histograms.
+            The y bin edges of the histograms.
 
         Raises
         ------
@@ -699,8 +729,8 @@ class CorsikaHistograms:
             if label is not valid.
         """
 
-        if label not in self._allowed_2D_labels:
-            msg = f"label is not valid. Valid entries are {self._allowed_2D_labels}"
+        if label not in self._allowed_2d_labels:
+            msg = f"label is not valid. Valid entries are {self._allowed_2d_labels}"
             self._logger.error(msg)
             raise ValueError
         self._raise_if_no_histogram()
@@ -709,7 +739,7 @@ class CorsikaHistograms:
             len(self.telescope_indices) if self.individual_telescopes is True else 1
         )
 
-        x_edges, y_edges, hist_values = [], [], []
+        x_bin_edges, y_bin_edges, hist_values = [], [], []
         for i_telescope in range(num_telescopes_to_fill):
             if label == "counts":
                 mini_hist = self.hist_position[i_telescope][:, :, sum]
@@ -724,12 +754,12 @@ class CorsikaHistograms:
             elif label == "time_altitude":
                 mini_hist = self.hist_time_altitude[i_telescope]
                 hist_values.append(self.hist_time_altitude[i_telescope].view().T)
-            x_edges.append(mini_hist.axes.edges[0].flatten())
-            y_edges.append(mini_hist.axes.edges[1].flatten())
+            x_bin_edges.append(mini_hist.axes.edges[0].flatten())
+            y_bin_edges.append(mini_hist.axes.edges[1].flatten())
 
-        return np.array(hist_values), np.array(x_edges), np.array(y_edges)
+        return np.array(hist_values), np.array(x_bin_edges), np.array(y_bin_edges)
 
-    def get_2D_photon_position_distr(self):
+    def get_2d_photon_position_distr(self):
         """
         Get 2D histograms of position of the Cherenkov photons on the ground.
 
@@ -738,13 +768,13 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The x edges of the count histograms in x, usually in meters.
+            The x bin edges of the count histograms in x, usually in meters.
         numpy.array
-            The y edges of the count histograms in y, usually in meters.
+            The y bin edges of the count histograms in y, usually in meters.
         """
-        return self._get_hist_2D_projection("counts")
+        return self._get_hist_2d_projection("counts")
 
-    def get_2D_photon_density_distr(self):
+    def get_2d_photon_density_distr(self):
         """
         Get 2D histograms of position of the Cherenkov photons on the ground. It returns the photon
         density per square meter.
@@ -754,13 +784,13 @@ class CorsikaHistograms:
         numpy.ndarray
             The values of the histogram, usually in $m^{-2}$
         numpy.array
-            The x edges of the density/count histograms in x, usually in meters.
+            The x bin edges of the density/count histograms in x, usually in meters.
         numpy.array
-            The y edges of the density/count histograms in y, usually in meters.
+            The y bin edges of the density/count histograms in y, usually in meters.
         """
-        return self._get_hist_2D_projection("density")
+        return self._get_hist_2d_projection("density")
 
-    def get_2D_photon_direction_distr(self):
+    def get_2d_photon_direction_distr(self):
         """
         Get 2D histograms of incoming direction of the Cherenkov photons on the ground.
 
@@ -769,13 +799,13 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The x edges of the direction histograms in cos(x).
+            The x bin edges of the direction histograms in cos(x).
         numpy.array
-            The y edges of the direction histograms in cos(y)
+            The y bin edges of the direction histograms in cos(y)
         """
-        return self._get_hist_2D_projection("direction")
+        return self._get_hist_2d_projection("direction")
 
-    def get_2D_photon_time_altitude_distr(self):
+    def get_2d_photon_time_altitude_distr(self):
         """
         Get 2D histograms of the time and altitude of the photon production.
 
@@ -784,13 +814,13 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The x edges of the time_altitude histograms, usually in ns.
+            The x bin edges of the time_altitude histograms, usually in ns.
         numpy.array
-            The y edges of the time_altitude histograms, usually in km.
+            The y bin edges of the time_altitude histograms, usually in km.
         """
-        return self._get_hist_2D_projection("time_altitude")
+        return self._get_hist_2d_projection("time_altitude")
 
-    def get_2D_num_photons_distr(self):
+    def get_2d_num_photons_distr(self):
         """
         Get the distribution of Cherenkov photons per event per telescope. It returns the 2D array
         accounting for the events from the telescopes given by `self.telescope_indices`.
@@ -810,11 +840,11 @@ class CorsikaHistograms:
         telescope_counter = np.arange(len(self.telescope_indices) + 1).reshape(
             1, len(self.telescope_indices) + 1
         )
-        hist_2D = np.array(self.num_photons_per_event_per_telescope)
-        hist_2D = hist_2D.reshape((1, len(self.telescope_indices), self.num_events))
-        return (hist_2D, num_events_array, telescope_counter)
+        hist_2d = np.array(self.num_photons_per_event_per_telescope)
+        hist_2d = hist_2d.reshape((1, len(self.telescope_indices), self.num_events))
+        return (hist_2d, num_events_array, telescope_counter)
 
-    def _get_hist_1D_projection(self, label):
+    def _get_hist_1d_projection(self, label):
         """
         Helper function to get 1D distributions.
 
@@ -828,7 +858,7 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The edges of the histogram.
+            The bin edges of the histogram.
 
         Raises
         ------
@@ -836,13 +866,13 @@ class CorsikaHistograms:
             if label is not valid.
         """
 
-        if label not in self._allowed_1D_labels:
-            msg = f"{label} is not valid. Valid entries are {self._allowed_1D_labels}"
+        if label not in self._allowed_1d_labels:
+            msg = f"{label} is not valid. Valid entries are {self._allowed_1d_labels}"
             self._logger.error(msg)
             raise ValueError
         self._raise_if_no_histogram()
 
-        x_edges_list, hist_1D_list = [], []
+        x_bin_edges_list, hist_1d_list = [], []
         for i_hist, _ in enumerate(self.hist_position):
             if label == "wavelength":
                 mini_hist = self.hist_position[i_hist][sum, sum, :]
@@ -851,9 +881,9 @@ class CorsikaHistograms:
             elif label == "altitude":
                 mini_hist = self.hist_time_altitude[i_hist][sum, :]
 
-            x_edges_list.append(mini_hist.axes.edges.T.flatten()[0])
-            hist_1D_list.append(mini_hist.view().T)
-        return np.array(hist_1D_list), np.array(x_edges_list)
+            x_bin_edges_list.append(mini_hist.axes.edges.T.flatten()[0])
+            hist_1d_list.append(mini_hist.view().T)
+        return np.array(hist_1d_list), np.array(x_bin_edges_list)
 
     def _get_bins_max_dist(self, bins=None, max_dist=None):
         """Auxiliary function to get the number of bins and the max distance to generate the
@@ -905,26 +935,26 @@ class CorsikaHistograms:
         np.array
             The counts of the 1D histogram with size = int(max_dist/bin_size).
         np.array
-            The edges of the 1D histogram in meters with size = int(max_dist/bin_size) + 1,
+            The bin edges of the 1D histogram in meters with size = int(max_dist/bin_size) + 1,
             usually in meter.
         """
 
         bins, max_dist = self._get_bins_max_dist(bins=bins, max_dist=max_dist)
-        edges_1D_list, hist1D_list = [], []
+        bin_edges_1d_list, hist_1d_list = [], []
 
-        hist2D_values_list, x_position_list, y_position_list = self.get_2D_photon_position_distr()
+        hist_2d_values_list, x_position_list, y_position_list = self.get_2d_photon_position_distr()
 
         for i_hist, _ in enumerate(x_position_list):
-            hist1D, edges_1D = convert_2D_to_radial_distr(
-                hist2D_values_list[i_hist],
-                x_position_list[i_hist],
+            hist_1d, bin_edges_1d = convert_2d_to_radial_distr(
+                hist_2d_values_list[i_hist],
+                x_position_list[i_hist],  # pylint: disable=unnecessary-list-index-lookup
                 y_position_list[i_hist],
                 bins=bins,
                 max_dist=max_dist,
             )
-            edges_1D_list.append(edges_1D)
-            hist1D_list.append(hist1D)
-        return np.array(hist1D_list), np.array(edges_1D_list)
+            bin_edges_1d_list.append(bin_edges_1d)
+            hist_1d_list.append(hist_1d)
+        return np.array(hist_1d_list), np.array(bin_edges_1d_list)
 
     def get_photon_density_distr(self, bins=None, max_dist=None):
         """
@@ -944,25 +974,25 @@ class CorsikaHistograms:
             The density distribution of the 1D histogram with size = int(max_dist/bin_size),
             usually in $m^{-2}$.
         np.array
-            The edges of the 1D histogram in meters with size = int(max_dist/bin_size) + 1,
+            The bin edges of the 1D histogram in meters with size = int(max_dist/bin_size) + 1,
             usually in meter.
         """
         bins, max_dist = self._get_bins_max_dist(bins=bins, max_dist=max_dist)
-        edges_1D_list, hist1D_list = [], []
+        bin_edges_1d_list, hist_1d_list = [], []
 
-        hist2D_values_list, x_position_list, y_position_list = self.get_2D_photon_density_distr()
+        hist_2d_values_list, x_position_list, y_position_list = self.get_2d_photon_density_distr()
 
         for i_hist, _ in enumerate(x_position_list):
-            hist1D, edges_1D = convert_2D_to_radial_distr(
-                hist2D_values_list[i_hist],
-                x_position_list[i_hist],
+            hist_1d, bin_edges_1d = convert_2d_to_radial_distr(
+                hist_2d_values_list[i_hist],
+                x_position_list[i_hist],  # pylint: disable=unnecessary-list-index-lookup
                 y_position_list[i_hist],
                 bins=bins,
                 max_dist=max_dist,
             )
-            edges_1D_list.append(edges_1D)
-            hist1D_list.append(hist1D)
-        return np.array(hist1D_list), np.array(edges_1D_list)
+            bin_edges_1d_list.append(bin_edges_1d)
+            hist_1d_list.append(hist_1d)
+        return np.array(hist_1d_list), np.array(bin_edges_1d_list)
 
     def get_photon_wavelength_distr(self):
         """
@@ -973,10 +1003,10 @@ class CorsikaHistograms:
         np.array
             The counts of the wavelength histogram.
         np.array
-            The edges of the wavelength histogram in nanometers.
+            The bin edges of the wavelength histogram in nanometers.
 
         """
-        return self._get_hist_1D_projection("wavelength")
+        return self._get_hist_1d_projection("wavelength")
 
     def get_photon_time_of_emission_distr(self):
         """
@@ -989,10 +1019,10 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The edges of the time histograms in ns.
+            The bin edges of the time histograms in ns.
 
         """
-        return self._get_hist_1D_projection("time")
+        return self._get_hist_1d_projection("time")
 
     def get_photon_altitude_distr(self):
         """
@@ -1003,10 +1033,10 @@ class CorsikaHistograms:
         numpy.ndarray
             The counts of the histogram.
         numpy.array
-            The edges of the photon altitude histograms in km.
+            The bin edges of the photon altitude histograms in km.
 
         """
-        return self._get_hist_1D_projection("altitude")
+        return self._get_hist_1d_projection("altitude")
 
     @property
     def num_photons_per_event_per_telescope(self):
@@ -1058,8 +1088,8 @@ class CorsikaHistograms:
         numpy.array
             Number of photons per event.
         """
-        hist, edges = np.histogram(self.num_photons_per_event, bins=bins, range=hist_range)
-        return hist.reshape(1, bins), edges.reshape(1, bins + 1)
+        hist, bin_edges = np.histogram(self.num_photons_per_event, bins=bins, range=hist_range)
+        return hist.reshape(1, bins), bin_edges.reshape(1, bins + 1)
 
     def get_num_photons_per_telescope_distr(self, bins=50, hist_range=None):
         """
@@ -1080,15 +1110,20 @@ class CorsikaHistograms:
             Number of photons per telescope.
         """
 
-        hist, edges = np.histogram(self.num_photons_per_telescope, bins=bins, range=hist_range)
-        return hist.reshape(1, bins), edges.reshape(1, bins + 1)
+        hist, bin_edges = np.histogram(self.num_photons_per_telescope, bins=bins, range=hist_range)
+        return hist.reshape(1, bins), bin_edges.reshape(1, bins + 1)
 
-    def export_histograms(self):
+    def export_histograms(self, overwrite=False):
         """
-        Export the histograms to ecsv files.
+        Export the histograms to hdf5 files.
+
+        Parameters
+        ----------
+        overwrite: bool
+            If True overwrites the histograms already saved in the hdf5 file.
         """
-        self._export_1D_histograms()
-        self._export_2D_histograms()
+        self._export_1d_histograms(overwrite=overwrite)
+        self._export_2d_histograms(overwrite=False)
 
     @property
     def _meta_dict(self):
@@ -1098,22 +1133,22 @@ class CorsikaHistograms:
         Returns
         -------
         dict
-            Meta dictionary for the ECSV files with the histograms.
+            Meta dictionary for the hdf5 files with the histograms.
         """
 
         if self.__meta_dict is None:
             self.__meta_dict = {
-                "CORSIKA version": self.corsika_version,
-                "simtools version": version.__version__,
-                "Original IACT file": self.input_file.name,
+                "corsika_version": self.corsika_version,
+                "simtools_version": version.__version__,
+                "iact_file": self.input_file.name,
                 "telescope_indices": list(self.telescope_indices),
                 "individual_telescopes": self.individual_telescopes,
-                "Note": "Only lower bin edges are given.",
+                "note": "Only lower bin edges are given.",
             }
         return self.__meta_dict
 
     @property
-    def _dict_1D_distributions(self):
+    def dict_1d_distributions(self):
         """
         Dictionary to label the 1D distributions according to the class methods.
 
@@ -1122,96 +1157,111 @@ class CorsikaHistograms:
         dict:
             The dictionary with information about the 1D distributions.
         """
-        self.__dict_1D_distributions = {
+        self._dict_1d_distributions = {
             "wavelength": {
                 "function": "get_photon_wavelength_distr",
-                "file name": "hist_1D_photon_wavelength_distr",
+                "file name": "hist_1d_photon_wavelength_distr",
                 "title": "Photon wavelength distribution",
-                "edges": "wavelength",
-                "edges unit": self.hist_config["hist_position"]["z axis"]["start"].unit,
+                "bin edges": "wavelength",
+                "axis unit": self.hist_config["hist_position"]["z axis"]["start"].unit,
             },
             "counts": {
                 "function": "get_photon_radial_distr",
-                "file name": "hist_1D_photon_radial_distr",
+                "file name": "hist_1d_photon_radial_distr",
                 "title": "Radial photon distribution on the ground",
-                "edges": "Distance to center",
-                "edges unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
+                "bin edges": "Distance to center",
+                "axis unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
             },
             "density": {
                 "function": "get_photon_density_distr",
-                "file name": "hist_1D_photon_density_distr",
+                "file name": "hist_1d_photon_density_distr",
                 "title": "Photon density distribution on the ground",
-                "edges": "Distance to center",
-                "edges unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
+                "bin edges": "Distance to center",
+                "axis unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
             },
             "time": {
                 "function": "get_photon_time_of_emission_distr",
-                "file name": "hist_1D_photon_time_distr",
+                "file name": "hist_1d_photon_time_distr",
                 "title": "Photon time of arrival distribution",
-                "edges": "Time of arrival",
-                "edges unit": self.hist_config["hist_time_altitude"]["x axis"]["start"].unit,
+                "bin edges": "Time of arrival",
+                "axis unit": self.hist_config["hist_time_altitude"]["x axis"]["start"].unit,
             },
             "altitude": {
                 "function": "get_photon_altitude_distr",
-                "file name": "hist_1D_photon_time_distr",
+                "file name": "hist_1d_photon_altitude_distr",
                 "title": "Photon altitude of emission distribution",
-                "edges": "Altitude of emission",
-                "edges unit": self.hist_config["hist_time_altitude"]["y axis"]["start"].unit,
+                "bin edges": "Altitude of emission",
+                "axis unit": self.hist_config["hist_time_altitude"]["y axis"]["start"].unit,
             },
             "num_photons_per_event": {
                 "function": "get_num_photons_per_event_distr",
-                "file name": "hist_1D_photon_per_event_distr",
+                "file name": "hist_1d_photon_per_event_distr",
                 "title": "Photons per event distribution",
-                "edges": "Event counter",
-                "edges unit": u.dimensionless_unscaled,
+                "bin edges": "Event counter",
+                "axis unit": u.dimensionless_unscaled,
             },
             "num_photons_per_telescope": {
                 "function": "get_num_photons_per_telescope_distr",
-                "file name": "hist_1D_photon_per_telescope_distr",
+                "file name": "hist_1d_photon_per_telescope_distr",
                 "title": "Photons per telescope distribution",
-                "edges": "Telescope counter",
-                "edges unit": u.dimensionless_unscaled,
+                "bin edges": "Telescope counter",
+                "axis unit": u.dimensionless_unscaled,
             },
         }
-        return self.__dict_1D_distributions
+        return self._dict_1d_distributions
 
-    def _export_1D_histograms(self):
+    def _export_1d_histograms(self, overwrite=False):
         """
         Auxiliary function to export only the 1D histograms.
+
+        Parameters
+        ----------
+        overwrite: bool
+            If True overwrites the histograms already saved in the hdf5 file.
         """
 
-        for _, function_dict in self._dict_1D_distributions.items():
-            self._meta_dict["Title"] = function_dict["title"]
+        for _, function_dict in self.dict_1d_distributions.items():
+            self._meta_dict["Title"] = sanitize_name(function_dict["title"])
             function = getattr(self, function_dict["function"])
-            hist_1D_list, x_edges_list = function()
-            x_edges_list = x_edges_list * function_dict["edges unit"]
+            hist_1d_list, x_bin_edges_list = function()
+            x_bin_edges_list = x_bin_edges_list * function_dict["axis unit"]
             if function_dict["function"] == "get_photon_density_distr":
-                histogram_value_unit = 1 / (function_dict["edges unit"] ** 2)
+                histogram_value_unit = 1 / (function_dict["axis unit"] ** 2)
             else:
                 histogram_value_unit = u.dimensionless_unscaled
-            hist_1D_list = hist_1D_list * histogram_value_unit
-            for i_histogram, _ in enumerate(x_edges_list):
+            hist_1d_list = hist_1d_list * histogram_value_unit
+            for i_histogram, _ in enumerate(x_bin_edges_list):
                 if self.individual_telescopes:
-                    ecsv_file = (
-                        f"{function_dict['file name']}_"
-                        f"tel_index_{self.telescope_indices[i_histogram]}.ecsv"
+                    hdf5_table_name = (
+                        f"/{function_dict['file name']}_"
+                        f"tel_index_{self.telescope_indices[i_histogram]}"
                     )
                 else:
-                    ecsv_file = f"{function_dict['file name']}_all_tels.ecsv"
-
-                table = self.fill_ecsv_table(
-                    hist_1D_list[i_histogram],
-                    x_edges_list[i_histogram],
-                    None,
-                    function_dict["edges"],
-                    None,
+                    hdf5_table_name = f"/{function_dict['file name']}_all_tels"
+
+                table = fill_hdf5_table(
+                    hist=hist_1d_list[i_histogram],
+                    x_bin_edges=x_bin_edges_list[i_histogram],
+                    y_bin_edges=None,
+                    x_label=function_dict["bin edges"],
+                    y_label=None,
+                    meta_data=self._meta_dict,
+                )
+                self._logger.info(
+                    f"Writing 1D histogram with name {hdf5_table_name} to "
+                    f"{self.hdf5_file_name}."
+                )
+                # overwrite takes precedence over append
+                if overwrite is True:
+                    append = False
+                else:
+                    append = True
+                write_table(
+                    table, self.hdf5_file_name, hdf5_table_name, append=append, overwrite=overwrite
                 )
-                ecsv_file = Path(self.output_path).joinpath(ecsv_file)
-                self._logger.info(f"Exporting histogram to {ecsv_file}.")
-                table.write(ecsv_file, format="ascii.ecsv", overwrite=True)
 
     @property
-    def _dict_2D_distributions(self):
+    def dict_2d_distributions(self):
         """
         Dictionary to label the 2D distributions according to the class methods.
 
@@ -1220,150 +1270,118 @@ class CorsikaHistograms:
         dict:
             The dictionary with information about the 2D distributions.
         """
-        if self.__dict_2D_distributions is None:
-            self.__dict_2D_distributions = {
+        if self._dict_2d_distributions is None:
+            self._dict_2d_distributions = {
                 "counts": {
-                    "function": "get_2D_photon_position_distr",
-                    "file name": "hist_2D_photon_count_distr",
+                    "function": "get_2d_photon_position_distr",
+                    "file name": "hist_2d_photon_count_distr",
                     "title": "Photon count distribution on the ground",
-                    "x edges": "x position on the ground",
-                    "x edges unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
-                    "y edges": "y position on the ground",
-                    "y edges unit": self.hist_config["hist_position"]["y axis"]["start"].unit,
+                    "x bin edges": "x position on the ground",
+                    "x axis unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
+                    "y bin edges": "y position on the ground",
+                    "y axis unit": self.hist_config["hist_position"]["y axis"]["start"].unit,
                 },
                 "density": {
-                    "function": "get_2D_photon_density_distr",
-                    "file name": "hist_2D_photon_density_distr",
+                    "function": "get_2d_photon_density_distr",
+                    "file name": "hist_2d_photon_density_distr",
                     "title": "Photon density distribution on the ground",
-                    "x edges": "x position on the ground",
-                    "x edges unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
-                    "y edges": "y position on the ground",
-                    "y edges unit": self.hist_config["hist_position"]["y axis"]["start"].unit,
+                    "x bin edges": "x position on the ground",
+                    "x axis unit": self.hist_config["hist_position"]["x axis"]["start"].unit,
+                    "y bin edges": "y position on the ground",
+                    "y axis unit": self.hist_config["hist_position"]["y axis"]["start"].unit,
                 },
                 "direction": {
-                    "function": "get_2D_photon_direction_distr",
-                    "file name": "hist_2D_photon_direction_distr",
+                    "function": "get_2d_photon_direction_distr",
+                    "file name": "hist_2d_photon_direction_distr",
                     "title": "Photon arrival direction",
-                    "x edges": "x direction cosine",
-                    "x edges unit": u.dimensionless_unscaled,
-                    "y edges": "y direction cosine",
-                    "y edges unit": u.dimensionless_unscaled,
+                    "x bin edges": "x direction cosine",
+                    "x axis unit": u.dimensionless_unscaled,
+                    "y bin edges": "y direction cosine",
+                    "y axis unit": u.dimensionless_unscaled,
                 },
                 "time_altitude": {
-                    "function": "get_2D_photon_time_altitude_distr",
-                    "file name": "hist_2D_photon_time_altitude_distr",
+                    "function": "get_2d_photon_time_altitude_distr",
+                    "file name": "hist_2d_photon_time_altitude_distr",
                     "title": "Time of arrival vs altitude of emission",
-                    "x edges": "Time of arrival",
-                    "x edges unit": self.hist_config["hist_time_altitude"]["x axis"]["start"].unit,
-                    "y edges": "Altitude of emission",
-                    "y edges unit": self.hist_config["hist_time_altitude"]["y axis"]["start"].unit,
+                    "x bin edges": "Time of arrival",
+                    "x axis unit": self.hist_config["hist_time_altitude"]["x axis"]["start"].unit,
+                    "y bin edges": "Altitude of emission",
+                    "y axis unit": self.hist_config["hist_time_altitude"]["y axis"]["start"].unit,
                 },
                 "num_photons_per_telescope": {
-                    "function": "get_2D_num_photons_distr",
-                    "file name": "hist_2D_photon_telescope_event_distr",
+                    "function": "get_2d_num_photons_distr",
+                    "file name": "hist_2d_photon_telescope_event_distr",
                     "title": "Number of photons per telescope and per event",
-                    "x edges": "Telescope counter",
-                    "x edges unit": u.dimensionless_unscaled,
-                    "y edges": "Event counter",
-                    "y edges unit": u.dimensionless_unscaled,
+                    "x bin edges": "Telescope counter",
+                    "x axis unit": u.dimensionless_unscaled,
+                    "y bin edges": "Event counter",
+                    "y axis unit": u.dimensionless_unscaled,
                 },
             }
-        return self.__dict_2D_distributions
+        return self._dict_2d_distributions
 
-    def _export_2D_histograms(self):
+    def _export_2d_histograms(self, overwrite):
         """
         Auxiliary function to export only the 2D histograms.
-        """
 
-        for property_name, function_dict in self._dict_2D_distributions.items():
-            self._meta_dict["Title"] = function_dict["title"]
+        Parameters
+        ----------
+        overwrite: bool
+            If True overwrites the histograms already saved in the hdf5 file.
+        """
+        for property_name, function_dict in self.dict_2d_distributions.items():
+            self._meta_dict["Title"] = sanitize_name(function_dict["title"])
             function = getattr(self, function_dict["function"])
 
-            hist_2D_list, x_edges_list, y_edges_list = function()
-            if function_dict["function"] == "get_2D_photon_density_distr":
+            hist_2d_list, x_bin_edges_list, y_bin_edges_list = function()
+            if function_dict["function"] == "get_2d_photon_density_distr":
                 histogram_value_unit = 1 / (
-                    self._dict_2D_distributions[property_name]["x edges unit"]
-                    * self._dict_2D_distributions[property_name]["y edges unit"]
+                    self.dict_2d_distributions[property_name]["x axis unit"]
+                    * self.dict_2d_distributions[property_name]["y axis unit"]
                 )
             else:
                 histogram_value_unit = u.dimensionless_unscaled
 
-            hist_2D_list, x_edges_list, y_edges_list = (
-                hist_2D_list * histogram_value_unit,
-                x_edges_list * self._dict_2D_distributions[property_name]["x edges unit"],
-                y_edges_list * self._dict_2D_distributions[property_name]["y edges unit"],
+            hist_2d_list, x_bin_edges_list, y_bin_edges_list = (
+                hist_2d_list * histogram_value_unit,
+                x_bin_edges_list * self.dict_2d_distributions[property_name]["x axis unit"],
+                y_bin_edges_list * self.dict_2d_distributions[property_name]["y axis unit"],
             )
 
-            for i_histogram, _ in enumerate(x_edges_list):
+            for i_histogram, _ in enumerate(x_bin_edges_list):
                 if self.individual_telescopes:
-                    ecsv_file = (
-                        f"{self._dict_2D_distributions[property_name]['file name']}"
-                        f"_tel_index_{self.telescope_indices[i_histogram]}.ecsv"
+                    hdf5_table_name = (
+                        f"/{self.dict_2d_distributions[property_name]['file name']}"
+                        f"_tel_index_{self.telescope_indices[i_histogram]}"
                     )
                 else:
-                    ecsv_file = (
-                        f"{self._dict_2D_distributions[property_name]['file name']}_all_tels.ecsv"
+                    hdf5_table_name = (
+                        f"/{self.dict_2d_distributions[property_name]['file name']}" f"_all_tels"
                     )
-
-                table = self.fill_ecsv_table(
-                    hist_2D_list[i_histogram],
-                    x_edges_list[i_histogram],
-                    y_edges_list[i_histogram],
-                    function_dict["x edges"],
-                    function_dict["y edges"],
+                table = fill_hdf5_table(
+                    hist=hist_2d_list[i_histogram],
+                    x_bin_edges=x_bin_edges_list[i_histogram],
+                    y_bin_edges=y_bin_edges_list[i_histogram],
+                    x_label=function_dict["x bin edges"],
+                    y_label=function_dict["y bin edges"],
+                    meta_data=self._meta_dict,
                 )
-                ecsv_file = Path(self.output_path).joinpath(ecsv_file)
-                self._logger.info(f"Exporting histogram to {ecsv_file}.")
-                table.write(ecsv_file, format="ascii.ecsv", overwrite=True)
 
-    def fill_ecsv_table(self, hist, x_edges, y_edges, x_label, y_label):
-        """
-        Create and fill an ecsv table with the histogram information.
-        It works for both 1D and 2D distributions.
-
-        Parameters
-        ----------
-        hist: numpy.ndarray
-            The counts of the histogram.
-        x_edges: numpy.array
-            The x edges of the histograms.
-        y_edges: numpy.array
-            The y edges of the histograms.
-        x_label: str
-            X edges label.
-        y_label: str
-            Y edges label.
-        """
-        try:
-            x_edges_2D, y_edges_2D = np.meshgrid(x_edges[:-1], y_edges[:-1])
-            x_edges_2D_flattened, y_edges_2D_flattened, hist_2D_flattened = (
-                x_edges_2D.flatten(),
-                y_edges_2D.flatten(),
-                hist.flatten(),
-            )
-            table = QTable(
-                [
-                    x_edges_2D_flattened,
-                    y_edges_2D_flattened,
-                    hist_2D_flattened,
-                ],
-                names=(x_label, y_label, "Values"),
-                meta=self._meta_dict,
-            )
-        except TypeError:
-            table = QTable(
-                [
-                    x_edges[:-1],
-                    hist,
-                ],
-                names=(x_label, "Values"),
-                meta=self._meta_dict,
-            )
-        return table
+                self._logger.info(
+                    f"Writing 2D histogram with name {hdf5_table_name} to "
+                    f"{self.hdf5_file_name}."
+                )
+                # Always appending to table due to the file previously created
+                # by self._export_1d_histograms.
+                write_table(
+                    table, self.hdf5_file_name, hdf5_table_name, append=True, overwrite=overwrite
+                )
 
-    def export_event_header_1D_histogram(self, event_header_element, bins=50, hist_range=None):
+    def export_event_header_1d_histogram(
+        self, event_header_element, bins=50, hist_range=None, overwrite=False
+    ):
         """
-        Export to a ecsv file the 1D histogram for the key `event_header_element` from the CORSIKA
+        Export to a hdf5 file the 1D histogram for the key `event_header_element` from the CORSIKA
         event header.
 
         Parameters
@@ -1375,28 +1393,44 @@ class CorsikaHistograms:
             Number of bins for the histogram.
         hist_range: 2-tuple
             Tuple to define the range of the histogram.
+        overwrite: bool
+            If True overwrites the histograms already saved in the hdf5 file.
         """
 
-        hist, edges = self.event_1D_histogram(
+        hist, bin_edges = self.event_1d_histogram(
             event_header_element, bins=bins, hist_range=hist_range
         )
-        edges *= self.event_information[event_header_element].unit
-        table = self.fill_ecsv_table(hist, edges, None, event_header_element, None)
-        ecsv_file = Path(self.output_path).joinpath(
-            f"event_1D_histograms_{event_header_element}.ecsv"
+        bin_edges *= self.event_information[event_header_element].unit
+        table = fill_hdf5_table(
+            hist=hist,
+            x_bin_edges=bin_edges,
+            y_bin_edges=None,
+            x_label=event_header_element,
+            y_label=None,
+            meta_data=self._meta_dict,
         )
-        self._logger.info(f"Exporting histogram to {ecsv_file}.")
-        table.write(ecsv_file, format="ascii.ecsv", overwrite=True)
+        hdf5_table_name = f"/event_2d_histograms_{event_header_element}"
 
-    def export_event_header_2D_histogram(
+        self._logger.info(
+            f"Exporting histogram with name {hdf5_table_name} to {self.hdf5_file_name}."
+        )
+        # overwrite takes precedence over append
+        if overwrite is True:
+            append = False
+        else:
+            append = True
+        write_table(table, self.hdf5_file_name, hdf5_table_name, append=append, overwrite=overwrite)
+
+    def export_event_header_2d_histogram(
         self,
         event_header_element_1,
         event_header_element_2,
         bins=50,
         hist_range=None,
+        overwrite=False,
     ):
         """
-        Export to a ecsv file the 2D histogram for the key `event_header_element_1` and
+        Export to a hdf5 file the 2D histogram for the key `event_header_element_1` and
         `event_header_element_2`from the CORSIKA event header.
 
         Parameters
@@ -1411,23 +1445,35 @@ class CorsikaHistograms:
             Number of bins for the histogram.
         hist_range: 2-tuple
             Tuple to define the range of the histogram.
+        overwrite: bool
+            If True overwrites the histograms already saved in the hdf5 file.
         """
-        hist, x_edges, y_edges = self.event_2D_histogram(
+        hist, x_bin_edges, y_bin_edges = self.event_2d_histogram(
             event_header_element_1, event_header_element_2, bins=bins, hist_range=hist_range
         )
-        x_edges *= self.event_information[event_header_element_1].unit
-        y_edges *= self.event_information[event_header_element_2].unit
-
-        table = self.fill_ecsv_table(
-            hist, x_edges, y_edges, event_header_element_1, event_header_element_2
+        x_bin_edges *= self.event_information[event_header_element_1].unit
+        y_bin_edges *= self.event_information[event_header_element_2].unit
+
+        table = fill_hdf5_table(
+            hist=hist,
+            x_bin_edges=x_bin_edges,
+            y_bin_edges=y_bin_edges,
+            x_label=event_header_element_1,
+            y_label=event_header_element_2,
+            meta_data=self._meta_dict,
         )
 
-        ecsv_file = Path(self.output_path).joinpath(
-            f"event_2D_histograms_{event_header_element_1}" f"_{event_header_element_2}.ecsv"
-        )
+        hdf5_table_name = f"/event_2d_histograms_{event_header_element_1}_{event_header_element_2}"
 
-        self._logger.info(f"Exporting histogram to {ecsv_file}.")
-        table.write(ecsv_file, format="ascii.ecsv", overwrite=True)
+        self._logger.info(
+            f"Exporting histogram with name {hdf5_table_name} to {self.hdf5_file_name}."
+        )
+        # overwrite takes precedence over append
+        if overwrite is True:
+            append = False
+        else:
+            append = True
+        write_table(table, self.hdf5_file_name, hdf5_table_name, append=append, overwrite=overwrite)
 
     @property
     def num_photons_per_telescope(self):
@@ -1632,7 +1678,7 @@ class CorsikaHistograms:
             raise KeyError
         return self.header[parameter]
 
-    def event_1D_histogram(self, key, bins=50, hist_range=None):
+    def event_1d_histogram(self, key, bins=50, hist_range=None):
         """
         Create a histogram for the all events using `key` as parameter.
         Valid keys are stored in `self.all_event_keys` (CORSIKA defined).
@@ -1664,14 +1710,14 @@ class CorsikaHistograms:
             msg = f"`key` is not valid. Valid entries are {self.all_event_keys}"
             self._logger.error(msg)
             raise KeyError
-        hist, edges = np.histogram(
+        hist, bin_edges = np.histogram(
             self.event_information[key].value,
             bins=bins,
             range=hist_range,
         )
-        return hist, edges
+        return hist, bin_edges
 
-    def event_2D_histogram(self, key_1, key_2, bins=50, hist_range=None):
+    def event_2d_histogram(self, key_1, key_2, bins=50, hist_range=None):
         """
         Create a 2D histogram for the all events using `key_1` and `key_2` as parameters.
         Valid keys are stored in `self.all_event_keys` (CORSIKA defined).
@@ -1712,10 +1758,10 @@ class CorsikaHistograms:
                 )
                 self._logger.error(msg)
                 raise KeyError
-        hist, x_edges, y_edges = np.histogram2d(
+        hist, x_bin_edges, y_bin_edges = np.histogram2d(
             self.event_information[key_1].value,
             self.event_information[key_2].value,
             bins=bins,
             range=hist_range,
         )
-        return hist, x_edges, y_edges
+        return hist, x_bin_edges, y_bin_edges