Merge branch 'master' into fix_effective_area

cta-observatory · Apr 7, 2022 · 6027a86 · 6027a86
2 parents 5167a08 + 9dbd6ee
commit 6027a86
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/ctaplot/gammaboard/gammaboard.py b/ctaplot/gammaboard/gammaboard.py
@@ -177,7 +177,7 @@ def load_run_configs(experiment, experiments_directory):
                     num_showers += row['num_showers'] * row['shower_reuse']
                 r_config['num_showers'] = num_showers
                 for col in run_config.colnames:
-                    if col not in ['num_showers', 'detector_prog_start', 'shower_prog_start']:
+                    if col not in ['num_showers', 'detector_prog_start', 'shower_prog_start', 'obs_id']:
                         try:
                             assert len(np.unique(run_config[:][col])) == (1 if col != 'run_array_direction' else 2)
                         except AssertionError:

diff --git a/ctaplot/plots/style.py b/ctaplot/plots/style.py
@@ -51,7 +51,6 @@ def set_style(style='notebook'):
     style: str
         'notebook', 'slides' or 'paper'
     """
-    mpl.rcParams.update(mpl.rcParamsDefault)
 
     style_path = get(f'ctaplot-{style}')
     mpl.pyplot.style.use(['seaborn-deep', style_path])

diff --git a/share/styles/ctaplot-notebook b/share/styles/ctaplot-notebook
@@ -1,11 +1,6 @@
 #### MATPLOTLIBRC FORMAT
 
 
-## figure ##
-
-figure.dpi : 200
-
-
 ## font ##
 
 text.usetex : False