Commit d197be00 authored by Moritz Huetten's avatar Moritz Huetten
Browse files

Merge branch 'dev-aberti' into 'master'

Adapt hillas calculation script to MAGIC reader v0.2.0

Closes #8

See merge request ievo/icrr-mpp-pipe!4
parents 8de06362 0ab3251a
...@@ -17,7 +17,7 @@ import traitlets ...@@ -17,7 +17,7 @@ import traitlets
import ctapipe import ctapipe
from ctapipe_io_magic import MAGICEventSource, MAGICEventSourceMC from ctapipe_io_magic import MAGICEventSource
from ctapipe.io import HDF5TableWriter from ctapipe.io import HDF5TableWriter
from ctapipe.core.container import Container, Field from ctapipe.core.container import Container, Field
...@@ -297,7 +297,7 @@ def process_dataset_mc(input_mask, output_name, image_cleaning_settings): ...@@ -297,7 +297,7 @@ def process_dataset_mc(input_mask, output_name, image_cleaning_settings):
print(f"-- Working on {file_name:s} --") print(f"-- Working on {file_name:s} --")
print("") print("")
# Event source # Event source
source = MAGICEventSourceMC(input_url=input_file) source = MAGICEventSource(input_url=input_file)
# Looping over the events # Looping over the events
for event in source: for event in source:
...@@ -322,9 +322,9 @@ def process_dataset_mc(input_mask, output_name, image_cleaning_settings): ...@@ -322,9 +322,9 @@ def process_dataset_mc(input_mask, output_name, image_cleaning_settings):
# Added on 06/07/2019 # Added on 06/07/2019
clean_mask = magic_clean_step1(camera,event_image,core_thresh=charge_thresholds['picture_thresh']) clean_mask = magic_clean_step1(camera,event_image,core_thresh=charge_thresholds['picture_thresh'])
if event_image[clean_mask].sum() == 0: if event_image[clean_mask].sum() == 0:
# Event did not survive image cleaining # Event did not survive image cleaining
continue continue
clean_mask = magic_clean_step2(camera, clean_mask, event_image, event_pulse_time, clean_mask = magic_clean_step2(camera, clean_mask, event_image, event_pulse_time,
max_time_off=time_thresholds['max_time_off'], max_time_off=time_thresholds['max_time_off'],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment