RACS-tools 2.2.6__tar.gz → 2.3.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/PKG-INFO +1 -1
  2. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/RACS_tools.egg-info/PKG-INFO +1 -1
  3. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/RACS_tools.egg-info/SOURCES.txt +1 -0
  4. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/beamcon_2D.py +6 -18
  5. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/beamcon_3D.py +6 -8
  6. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/getnoise_list.py +17 -3
  7. RACS-tools-2.3.0/racs_tools/logging.py +48 -0
  8. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/setup.py +1 -1
  9. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/LICENSE +0 -0
  10. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/RACS_tools.egg-info/dependency_links.txt +0 -0
  11. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/RACS_tools.egg-info/entry_points.txt +0 -0
  12. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/RACS_tools.egg-info/requires.txt +0 -0
  13. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/RACS_tools.egg-info/top_level.txt +0 -0
  14. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/README.md +0 -0
  15. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/pyproject.toml +0 -0
  16. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/__init__.py +0 -0
  17. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/au2.py +0 -0
  18. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/convolve_uv.py +0 -0
  19. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/racs_tools/gaussft.f +0 -0
  20. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/setup.cfg +0 -0
  21. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/tests/test_2d.py +0 -0
  22. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/tests/test_3d.py +0 -0
  23. {RACS-tools-2.2.6 → RACS-tools-2.3.0}/tests/test_noise.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: RACS-tools
3
- Version: 2.2.6
3
+ Version: 2.3.0
4
4
  Summary: Useful scripts for RACS.
5
5
  Home-page: https://github.com/AlecThomson/RACS-tools
6
6
  Author: Alec Thomson
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: RACS-tools
3
- Version: 2.2.6
3
+ Version: 2.3.0
4
4
  Summary: Useful scripts for RACS.
5
5
  Home-page: https://github.com/AlecThomson/RACS-tools
6
6
  Author: Alec Thomson
@@ -15,6 +15,7 @@ racs_tools/beamcon_3D.py
15
15
  racs_tools/convolve_uv.py
16
16
  racs_tools/gaussft.f
17
17
  racs_tools/getnoise_list.py
18
+ racs_tools/logging.py
18
19
  tests/test_2d.py
19
20
  tests/test_3d.py
20
21
  tests/test_noise.py
@@ -24,10 +24,7 @@ from tqdm import tqdm
24
24
 
25
25
  from racs_tools import au2
26
26
  from racs_tools.convolve_uv import smooth
27
-
28
- logger = logging.getLogger(__name__)
29
- logger.setLevel(logging.WARNING)
30
-
27
+ from racs_tools.logging import logger, setup_logger
31
28
 
32
29
  #############################################
33
30
  #### ADAPTED FROM SCRIPT BY T. VERNSTROM ####
@@ -800,21 +797,12 @@ def cli():
800
797
  )
801
798
 
802
799
  args = parser.parse_args()
803
- if args.mpi:
804
- from mpi4py import MPI
800
+ # Set up logging
801
+ logger = setup_logger(
802
+ verbosity=args.verbosity,
803
+ filename=args.logfile,
804
+ )
805
805
 
806
- comm = MPI.COMM_WORLD
807
- myPE = comm.Get_rank()
808
- else:
809
- try:
810
- myPE = psutil.Process().cpu_num()
811
- except AttributeError:
812
- myPE = 0
813
- if args.verbosity == 1:
814
- logger.setLevel(
815
- level=logging.INFO)
816
- elif args.verbosity >= 2:
817
- logger.basicConfig(level=logger.DEBUG)
818
806
  pool = schwimmbad.choose_pool(mpi=args.mpi, processes=args.n_cores)
819
807
  if args.mpi:
820
808
  if not pool.is_master():
@@ -26,9 +26,7 @@ from tqdm import tqdm, trange
26
26
  from racs_tools import au2
27
27
  from racs_tools.beamcon_2D import my_ceil, round_up
28
28
  from racs_tools.convolve_uv import smooth
29
-
30
- logger = logging.getLogger(__name__)
31
- logger.setLevel(logging.WARNING)
29
+ from racs_tools.logging import logger, setup_logger
32
30
 
33
31
  mpiSwitch = False
34
32
  if (
@@ -1353,11 +1351,11 @@ def cli():
1353
1351
 
1354
1352
  args = parser.parse_args()
1355
1353
 
1356
- if args.verbosity == 1:
1357
- logger.setLevel(
1358
- level=logging.INFO)
1359
- elif args.verbosity >= 2:
1360
- logger.basicConfig(level=logger.DEBUG)
1354
+ # Set up logging
1355
+ logger = setup_logger(
1356
+ verbosity=args.verbosity,
1357
+ filename=args.logfile,
1358
+ )
1361
1359
 
1362
1360
  arg_dict = vars(args)
1363
1361
  # Pop the verbosity argument
@@ -12,10 +12,9 @@ from astropy.stats import mad_std
12
12
  from spectral_cube import SpectralCube
13
13
  from spectral_cube.utils import SpectralCubeWarning
14
14
 
15
- warnings.filterwarnings(action="ignore", category=SpectralCubeWarning, append=True)
15
+ from racs_tools.logging import logger, setup_logger
16
16
 
17
- logger = logging.getLogger(__name__)
18
- logger.setLevel(logging.INFO)
17
+ warnings.filterwarnings(action="ignore", category=SpectralCubeWarning, append=True)
19
18
 
20
19
 
21
20
  #############################################
@@ -245,9 +244,24 @@ def cli() -> None:
245
244
  default=None,
246
245
  type=str,
247
246
  )
247
+ parser.add_argument(
248
+ "-v", "--verbosity", default=0, action="count", help="Increase output verbosity"
249
+ )
250
+ parser.add_argument(
251
+ "--logfile",
252
+ default=None,
253
+ type=str,
254
+ help="Save logging output to file",
255
+ )
248
256
 
249
257
  args = parser.parse_args()
250
258
 
259
+ # Set up logging
260
+ logger = setup_logger(
261
+ verbosity=args.verbosity,
262
+ filename=args.logfile,
263
+ )
264
+
251
265
  main(
252
266
  qfile=args.qfile,
253
267
  ufile=args.ufile,
@@ -0,0 +1,48 @@
1
+ #!/usr/bin/env python3
2
+ # -*- coding: utf-8 -*-
3
+
4
+ import logging
5
+ from typing import Optional
6
+
7
+ try:
8
+ from mpi4py import MPI
9
+
10
+ myPE = MPI.COMM_WORLD.Get_rank()
11
+ except ImportError:
12
+ myPE = 0
13
+
14
+ logging.captureWarnings(True)
15
+ logger = logging.getLogger("racs_tools")
16
+ logger.setLevel(logging.WARNING)
17
+
18
+ formatter = logging.Formatter(
19
+ fmt=f"[{myPE}] %(asctime)s.%(msecs)03d %(levelname)s %(module)s - %(funcName)s: %(message)s",
20
+ datefmt="%Y-%m-%d %H:%M:%S",
21
+ )
22
+
23
+
24
+ def setup_logger(
25
+ verbosity: int = 0,
26
+ filename: Optional[str] = None,
27
+ ):
28
+ if verbosity == 0:
29
+ level = logging.WARNING
30
+ elif verbosity == 1:
31
+ level = logging.INFO
32
+ elif verbosity >= 2:
33
+ level = logging.DEBUG
34
+
35
+ ch = logging.StreamHandler()
36
+ ch.setLevel(level)
37
+ ch.setFormatter(formatter)
38
+
39
+ logger.setLevel(level)
40
+ logger.addHandler(ch)
41
+
42
+ if filename is not None:
43
+ fh = logging.FileHandler(filename)
44
+ fh.setLevel(level)
45
+ fh.setFormatter(formatter)
46
+ logger.addHandler(fh)
47
+
48
+ return logger
@@ -19,7 +19,7 @@ URL = "https://github.com/AlecThomson/RACS-tools"
19
19
  EMAIL = "alec.thomson@csiro.au"
20
20
  AUTHOR = "Alec Thomson"
21
21
  REQUIRES_PYTHON = ">=3.8.0"
22
- VERSION = "2.2.6"
22
+ VERSION = "2.3.0"
23
23
 
24
24
  # What packages are required for this module to be executed?
25
25
  REQUIRED = [
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes