add missing pages (#396)

DataMedSci · May 19, 2021 · b4c203a · b4c203a
1 parent c40e8d9
commit b4c203a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/pymchelper/readers/shieldhit/reader_bdo2016.py b/pymchelper/readers/shieldhit/reader_bdo2016.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from pymchelper.estimator import MeshAxis
+from pymchelper.estimator import MeshAxis, Page
 from pymchelper.readers.shieldhit.reader_base import SHReader, _get_mesh_units, _bintyp, _get_detector_unit, \
     read_next_token
 from pymchelper.readers.shieldhit.binary_spec import SHBDOTagID, detector_name_from_bdotag
@@ -29,6 +29,10 @@ def read_data(self, estimator):
             logger.debug("Endian: " + _x['end'][0].decode('ASCII'))
             logger.debug("VerStr: " + _x['vstr'][0].decode('ASCII'))
 
+            # if no pages are present, add first one
+            if not estimator.pages:
+                estimator.add_page(Page())
+
             while f:
                 token = read_next_token(f)
                 if token is None:

diff --git a/pymchelper/readers/shieldhit/reader_bdo2019.py b/pymchelper/readers/shieldhit/reader_bdo2019.py
@@ -89,17 +89,25 @@ def read_data(self, estimator):
                         estimator.z = estimator.z._replace(unit=_units[2])
                         _has_geo_units_in_ascii = True
 
-                # detector type
+                # page(detector) type
                 if token_id == SHBDOTagID.SHBDO_PAG_TYPE:
+                    # if no pages present, add first one
+                    if not estimator.pages:
+                        logger.debug("SHBDO_PAG_TYPE Creating first page")
+                        estimator.add_page(Page())
                     # check if detector type attribute present, if yes, then create new page
                     if estimator.pages[-1].dettyp is not None:  # the same tag appears again, looks like new page
                         logger.debug("SHBDO_PAG_TYPE Creating new page no {}".format(len(estimator.pages)))
                         estimator.add_page(Page())
                     logger.debug("Setting page.dettyp = {} ({})".format(SHDetType(payload), SHDetType(payload).name))
                     estimator.pages[-1].dettyp = SHDetType(payload)
 
-                # detector data
+                # page(detector) data
                 if token_id == SHBDOTagID.SHBDO_PAG_DATA:
+                    # if no pages present, add first one
+                    if not estimator.pages:
+                        logger.debug("SHBDO_PAG_TYPE Creating first page")
+                        estimator.add_page(Page())
                     # check if data attribute present, if yes, then create new page
                     if estimator.pages[-1].data_raw.size > 1:
                         logger.debug("SHBDO_PAG_DATA Creating new page no {}".format(len(estimator.pages)))
@@ -137,7 +145,7 @@ def read_data(self, estimator):
             # Copy the SH12A specific units into the general placeholders:
             for page in estimator.pages:
                 page.unit = page.data_unit
-                # in future, a user may optionially give a more specific name in SH12A detect.dat, which then
+                # in future, a user may optionally give a more specific name in SH12A detect.dat, which then
                 # may be written to the .bdo file. If the name is not set, use the official detector name instead:
                 if not page.name:
                     page.name = str(page.dettyp)