Merge branch 'master' into trig_events

.github/workflows/continuousintegration.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2

ctaplot/ana/ana.py

@@ -618,7 +618,7 @@ def energy_resolution_per_energy(true_energy, reco_energy,
                                        confidence_level=confidence_level,
                                        bias_correction=bias_correction))
 
-    return irf.energy_bins, np.array(res_e)
+    return bins, np.array(res_e)
 
 
 @u.quantity_input(true_energy=u.TeV, reco_energy=u.TeV, bins=u.TeV)
@@ -904,7 +904,7 @@ def effective_area_per_energy(true_energy, reco_energy, simu_area, bins=None):
     count_S, bin_S = np.histogram(true_energy, bins=bins)
 
     np.seterr(divide='ignore', invalid='ignore')
-    return irf.energy_bins, np.nan_to_num(simu_area * count_R / count_S)
+    return bins, np.nan_to_num(simu_area * count_R / count_S)
 
 
 @u.quantity_input(true_x=u.m, reco_x=u.m, true_y=u.m, reco_y=u.m)

ctaplot/gammaboard/gammaboard.py

@@ -51,14 +51,17 @@ def find_data_files(experiment, experiments_directory):
     return tuple(file_set)
 
 
-def load_data_from_h5(experiment, experiments_directory, join_type='exact', metadata_conflicts='silent'):
+def load_data_from_h5(experiment, experiments_directory, join_type='inner', metadata_conflicts='silent'):
     """
     Load an hdf5 file containing results from an experiment
 
     Args
         experiment (str): the name of the experiment
         experiments_directory (str): the path to the folder containing the experiment folders
-        join_type (str): 'inner' | 'exact' (default) | 'outer'
+        join_type (str): 'inner' (default) | 'exact' | 'outer'
+            'inner': takes the intersection of all data tables
+            'exact': all data tables must have exactly the same columns
+            'outer': takes union of columns and fill missing values
         metadata_conflicts (str): 'silent' (default) | 'warn' | 'error'
 
     Returns

ctaplot/plots/plots.py

@@ -1515,7 +1515,10 @@ def plot_resolution_difference(bins, reference_resolution, new_resolution, ax=No
 
     ax = plt.gca() if ax is None else ax
     delta_res = new_resolution - reference_resolution
-    delta_res[:, 1:] = 0  # the condidence intervals have no meaning here
+    # delta_res[:, 1:] = 0  # the condidence intervals have no meaning here
+    # the condidence intervals have no meaning here
+    delta_res[:, 1] = delta_res[:, 0]
+    delta_res[:, 2] = delta_res[:, 0]
     with quantity_support():
         plot_resolution(bins, delta_res, ax=ax, **kwargs)
     ax.set_ylabel(r"$\Delta$ res")

docs/conf.py

@@ -54,6 +54,7 @@ def get_property(prop, project):
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
     'sphinx.ext.coverage',
+    'sphinx.ext.viewcode',
     'sphinx.ext.imgmath',
     'sphinx.ext.githubpages',
     'sphinx.ext.napoleon',

environment.yml

@@ -18,3 +18,4 @@ dependencies:
   - scipy
   - ipympl
   - tqdm
+  - h5py