Merge pull request #268 from FrancaCassol/correct_geometry_bug

Load geometry from ctapipe_io_lst
cta-observatory · Jan 22, 2020 · 7e65e2c · 7e65e2c
2 parents 2b75d16 + 976fd47
commit 7e65e2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lstchain/scripts/onsite/onsite_create_calibration_file.py b/lstchain/scripts/onsite/onsite_create_calibration_file.py
@@ -123,7 +123,7 @@ def main():
         # produce drs4 time calibration file
         #
         time_file = f"{output_dir}/time_calibration.Run{run}.0000.hdf5"
-     
+
         if default_time_run is 0:
             print(f"\n--> PRODUCING TIME CALIBRATION in {time_file} ...")
             cmd = f"lstchain_data_create_time_calibration_file  --input_file {input_file} " \

diff --git a/lstchain/visualization/plot_calib.py b/lstchain/visualization/plot_calib.py
@@ -3,7 +3,7 @@
 from ctapipe.visualization import CameraDisplay
 import numpy as np
 from matplotlib.backends.backend_pdf import PdfPages
-from ctapipe.instrument import  CameraGeometry
+from ctapipe_io_lst import load_camera_geometry
 
 # read back the monitoring containers written with the tool calc_camera_calibration.py
 from ctapipe.io.containers import FlatFieldContainer, WaveformCalibrationContainer, PedestalContainer, \
@@ -63,7 +63,8 @@ def plot_all(ped_data, ff_data, calib_data, run=0, plot_file="none"):
      calib_data: calibration container WaveformCalibrationContainer()
 
      """
-    camera = CameraGeometry.from_name("LSTCam", 4)
+    # read geometry
+    camera = load_camera_geometry()
 
     # plot open pdf
     if plot_file != "none":