Refactoring the utils from the site pipeline (#1489)

Author: iparask

sotodlib/io/bookbinder.py

@@ -17,7 +17,7 @@
 import datetime as dt
 from zipfile import ZipFile, ZIP_DEFLATED
 import sotodlib
-from sotodlib.site_pipeline.util import init_logger
+from sotodlib.site_pipeline.utils.logging import init_logger
 from .datapkg_utils import walk_files
 
 

sotodlib/io/imprinter.py

@@ -30,7 +30,7 @@
 from .datapkg_utils import load_configs, get_imprinter_config
 from .check_book import BookScanner
 from .g3thk_db import G3tHk, HKFiles
-from ..site_pipeline.util import init_logger
+from ..site_pipeline.utils.logging import init_logger
 
 
 ####################

sotodlib/site_pipeline/__init__.py

@@ -1,2 +1,2 @@
-from . import util
+from . import utils
 

sotodlib/site_pipeline/analyze_bright_ptsrc.py

@@ -21,14 +21,15 @@
 from datetime import datetime
 import argparse as ap
 import yaml
-from sotodlib.site_pipeline import util
+from sotodlib.site_pipeline.utils.logging import init_logger
+from sotodlib.site_pipeline.utils.pipeline import main_launcher
 from dataclasses import dataclass
 import matplotlib
 matplotlib.use('agg')
 
 opj = os.path.join
 
-logger = util.init_logger(__name__)
+logger = init_logger(__name__)
 
 
 def find_source(
@@ -1296,4 +1297,4 @@ def get_parser(parser=None):
 
 
 if __name__ == "__main__":
-    util.main_launcher(main, get_parser)
+    main_launcher(main, get_parser)

sotodlib/site_pipeline/calibration/wiregrid.py

@@ -13,8 +13,8 @@
 from sotodlib import core
 from sotodlib.io import hkdb
 from sotodlib.io import hk_utils
-from sotodlib.site_pipeline import util
-logger = util.init_logger('wiregrid', 'wiregrid: ')
+from sotodlib.site_pipeline.utils.logging import init_logger
+logger = init_logger('wiregrid', 'wiregrid: ')
 
 # hardware specific constants, which may have to be sperated as a config file
 WG_COUNTS2RAD = 2*np.pi/52000 # SATP1~SATP3, JSAT(SATP4?) will be 104000

sotodlib/site_pipeline/check_book.py

@@ -80,7 +80,8 @@
 import sys
 import yaml
 
-from . import util
+from .utils.logging import init_logger
+from .utils.pipeline import main_launcher
 
 
 def get_parser(parser=None):
@@ -172,7 +173,7 @@ def add_to_obsfiledb(info, logger, config, overwrite=False):
 
 
 def main(book_dir, config=None, add=None, overwrite=None, verbose=None):
-    logger = util.init_logger(__name__, 'check_book: ',
+    logger = init_logger(__name__, 'check_book: ',
                               verbosity=(3 if verbose else 2))
 
     if config is not None:
@@ -191,4 +192,4 @@ def main(book_dir, config=None, add=None, overwrite=None, verbose=None):
 
 
 if __name__ == '__main__':
-    util.main_launcher(main, get_parser)
+    main_launcher(main, get_parser)

sotodlib/site_pipeline/cleanup_level2.py

@@ -5,7 +5,7 @@
 
 from sotodlib.io.imprinter import Imprinter
 from sotodlib.io.datapkg_completion import DataPackaging
-from sotodlib.site_pipeline.util import init_logger
+from sotodlib.site_pipeline.utils.logging import init_logger
 
 logger = init_logger(__name__, "cleanup_level2: ")
 

sotodlib/site_pipeline/finalize_focal_plane.py

@@ -30,9 +30,9 @@
 from sotodlib.coords.pointing_model import apply_pointing_model
 from sotodlib.core import AxisManager, Context, IndexAxis, metadata
 from sotodlib.io.metadata import read_dataset
-from sotodlib.site_pipeline import util
+from sotodlib.site_pipeline.utils.logging import init_logger
 
-logger = util.init_logger(__name__, "finalize_focal_plane: ")
+logger = init_logger(__name__, "finalize_focal_plane: ")
 
 
 def _create_db(filename, per_obs, obs_ids, start_time, stop_time):

sotodlib/site_pipeline/generate_reports.py

@@ -17,7 +17,7 @@
 from importlib import reload
 reload(plots)
 
-import sotodlib.site_pipeline.util as sp_util
+from sotodlib.site_pipeline.utils.pipeline import main_launcher
 
 
 def create_manifest(base_dir: str, output_file: str):
@@ -218,4 +218,4 @@ def get_parser(
 
 
 if __name__ == '__main__':
-    sp_util.main_launcher(main, get_parser)
+    main_launcher(main, get_parser)

sotodlib/site_pipeline/make_atomic_filterbin_map.py

@@ -15,7 +15,6 @@
 from sqlalchemy.orm import sessionmaker
 
 import numpy as np
-import sotodlib.site_pipeline.util as util
 from sotodlib import coords, mapmaking
 from sotodlib.core import Context
 from sotodlib.io import hk_utils