minor

Author: chiaratomaiuolo

hexsample/bin/hxsim.py

@@ -30,7 +30,7 @@
 from hexsample import HEXSAMPLE_DATA
 from hexsample.app import ArgumentParser
 from hexsample.readout import HexagonalReadoutMode, readout_chip
-from hexsample.fileio import _digioutput_class
+from hexsample.fileio import DigiDescriptionSparse, DigiDescriptionRectangular, DigiDescriptionCircular, digioutput_class
 from hexsample.hexagon import HexagonalLayout
 from hexsample.mc import PhotonList
 from hexsample.roi import Padding
@@ -79,8 +79,8 @@ def hxsim(**kwargs):
     readout = readout_chip(readout_mode, *args)
     logger.info(f'Readout chip: {readout}')
     output_file_path = kwargs.get('outfile')
-    output_file = _digioutput_class(readout_mode)(output_file_path)
-    output_file.update_header(*args)
+    output_file = digioutput_class(readout_mode)(output_file_path)
+    output_file.update_header(**kwargs)
     logger.info('Starting the event loop...')
     for mc_event in tqdm(photon_list):
         x, y = mc_event.propagate(sensor.trans_diffusion_sigma)

hexsample/fileio.py

@@ -539,7 +539,7 @@ def flush(self) -> None:
     HexagonalReadoutMode.CIRCULAR: DigiOutputFileCircular
 }
 
-def _digioutput_class(mode: HexagonalReadoutMode) -> DigiOutputFileSparse | DigiOutputFileRectangular | DigiDescriptionCircular:
+def digioutput_class(mode: HexagonalReadoutMode) -> DigiOutputFileSparse | DigiOutputFileRectangular | DigiDescriptionCircular:
     """Return the proper class to be used as DigiOutputFile, depending on the
     readout mode of the chip.
     """

tests/test_fileio.py

@@ -25,7 +25,7 @@
 from hexsample.fileio import DigiInputFile, DigiInputFileSparse, DigiInputFileRectangular,\
     DigiInputFileCircular, ReconInputFile, ReconOutputFile,FileType,\
     DigiOutputFile, DigiOutputFileSparse, DigiOutputFileRectangular, DigiOutputFileCircular,\
-    peek_file_type, peek_readout_type, open_input_file, _digioutput_class
+    peek_file_type, peek_readout_type, open_input_file, digioutput_class
 from hexsample.mc import MonteCarloEvent
 from hexsample.roi import RegionOfInterest, Padding
 
@@ -61,7 +61,7 @@ def _test_write(file_path, num_events : int = 10):
     """Small test writing a bunch of toy event structures to file.
     This test considers a rectangular type of readout.
     """
-    output_file = _digioutput_class(HexagonalReadoutMode.RECTANGULAR)(file_path)
+    output_file = digioutput_class(HexagonalReadoutMode.RECTANGULAR)(file_path)
     for i in range(num_events):
         output_file.add_row(_digi_event_rectangular(i), _mc_event(i))
     output_file.close()
@@ -70,7 +70,7 @@ def _test_write_sparse(file_path, num_events : int = 10):
     """Small test writing a bunch of toy event structures to file.
     This test considers a sparse type of readout.
     """
-    output_file = _digioutput_class(HexagonalReadoutMode.SPARSE)(file_path)
+    output_file = digioutput_class(HexagonalReadoutMode.SPARSE)(file_path)
     for i in range(num_events):
         output_file.add_row(_digi_event_sparse(i), _mc_event(i))
     output_file.close()
@@ -79,7 +79,7 @@ def _test_write_circular(file_path, num_events : int = 10):
     """Small test writing a bunch of toy event structures to file.
     This test considers a sparse type of readout.
     """
-    output_file = _digioutput_class(HexagonalReadoutMode.CIRCULAR)(file_path)
+    output_file = digioutput_class(HexagonalReadoutMode.CIRCULAR)(file_path)
     for i in range(num_events):
         output_file.add_row(_digi_event_circular(i), _mc_event(i))
     output_file.close()