From 7697b64f14fa96a1c25730af2eae4e8ec646d132 Mon Sep 17 00:00:00 2001 From: Thomas Vuillaume Date: Tue, 17 Sep 2024 18:10:26 +0200 Subject: [PATCH] fix test DL2 and IRF paths (#495) * fix test DL2 and IRF paths including particle type to separate Gamma and GammaDiffuse * remove commented code --------- Co-authored-by: vuillaut --- lstmcpipe/config/paths_config.py | 47 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/lstmcpipe/config/paths_config.py b/lstmcpipe/config/paths_config.py index 86c2a93e..55b2d868 100644 --- a/lstmcpipe/config/paths_config.py +++ b/lstmcpipe/config/paths_config.py @@ -445,11 +445,25 @@ def dl1_dir(self, particle, pointing, dataset_type, dec): dec=dec, ) - def dl2_dir(self, particle, pointing, dataset_type): - raise NotImplementedError("Should be implemented in child class if necessary") + def dl2_dir(self, particle, pointing, dataset_type, dec): + return self._data_level_dir( + data_level='DL2', + particle=particle, + pointing=pointing, + prod_id=self.prod_id, + dataset_type=dataset_type, + dec=dec, + ) - def irf_dir(self, pointing, dataset_type): - raise NotImplementedError("Should be implemented in child class if necessary") + def irf_dir(self, particle, pointing, dataset_type, dec): + return self._data_level_dir( + data_level='IRF', + particle=particle, + pointing=pointing, + prod_id=self.prod_id, + dataset_type=dataset_type, + dec=dec, + ) def models_dir(self): p = self.base_dir.format( @@ -791,25 +805,14 @@ def dl1_dir(self, pointing, dec=''): # no declination for DL1 for TestingDataset return super().dl1_dir(particle=self.particle, pointing=pointing, dataset_type=self.dataset_type, dec=dec) - def dl2_dir(self, pointing): - return self._data_level_dir( - data_level='DL2', - particle='', - pointing=pointing, - prod_id=self.prod_id, - dataset_type=self.dataset_type, - dec=self.dec, - ) - def irf_dir(self, pointing): - return self._data_level_dir( - data_level='IRF', - particle='', - pointing=pointing, - prod_id=self.prod_id, - dataset_type=self.dataset_type, - dec=self.dec, - ) + def dl2_dir(self, pointing, dec=''): + # no declination for DL2 for TestingDataset + return super().dl2_dir(particle=self.particle, pointing=pointing, dataset_type=self.dataset_type, dec=dec) + + def irf_dir(self, pointing, dec=''): + return super().irf_dir(particle=self.particle, pointing=pointing, dataset_type=self.dataset_type, dec=dec) + @property def r0_to_dl1(self):