diff --git a/rfinder/main.py b/rfinder/main.py index cd56141..a2dfc9c 100644 --- a/rfinder/main.py +++ b/rfinder/main.py @@ -28,10 +28,10 @@ sys.path.append(os.path.join(RFINDER_PATH, 'rfinder')) -import rfi -import rfinder_stats as rfi_stats -import rfinder_plots as rfi_plots -import rfinder_files as rfiFL +from rfinder import rfi +from rfinder import rfinder_stats as rfi_stats +from rfinder import rfinder_plots as rfi_plots +from rfinder import rfinder_files as rfiFL rfi = rfi.rfi() rfiST = rfi_stats.rfi_stats() diff --git a/rfinder/rfi.py b/rfinder/rfi.py index ab069bb..aca817e 100644 --- a/rfinder/rfi.py +++ b/rfinder/rfi.py @@ -17,10 +17,9 @@ from astropy.io import fits, ascii from astropy import units as u from astropy.table import Table, Column, MaskedColumn -import rfinder -import rfinder_stats as rfi_stats -import rfinder_files as rfi_files +from rfinder import rfinder_stats as rfi_stats +from rfinder import rfinder_files as rfi_files rfiST = rfi_stats.rfi_stats() diff --git a/rfinder/rfinder_files.py b/rfinder/rfinder_files.py index eca57d1..8a72ba9 100644 --- a/rfinder/rfinder_files.py +++ b/rfinder/rfinder_files.py @@ -1,11 +1,11 @@ import base64 -import os, string, sys, glob +import shutil import numpy as np +import os, string, sys, glob from astropy.io import fits as fits from astropy import units as u from jinja2 import FileSystemLoader, Environment -import shutil -import rfinder_stats as rfi_stats +from rfinder import rfinder_stats as rfi_stats rfiST = rfi_stats.rfi_stats() import logging diff --git a/rfinder/rfinder_plots.py b/rfinder/rfinder_plots.py index 28d7ae5..bde6929 100644 --- a/rfinder/rfinder_plots.py +++ b/rfinder/rfinder_plots.py @@ -26,9 +26,9 @@ import logging -import rfi +from rfinder import rfi rfi = rfi.rfi() -import rfinder_stats as rfi_stats +from rfinder import rfinder_stats as rfi_stats rfiST = rfi_stats.rfi_stats() diff --git a/rfinder/rfinder_stats.py b/rfinder/rfinder_stats.py index ba14468..c4b8421 100644 --- a/rfinder/rfinder_stats.py +++ b/rfinder/rfinder_stats.py @@ -6,25 +6,21 @@ import yaml import json import glob -import casacore.tables as tables import logging import multiprocessing +import casacore.tables as tables from astropy.time import Time -from astropy.coordinates import SkyCoord, EarthLocation, AltAz from astropy.io import fits, ascii from astropy import units as u from astropy.table import Table, Column, MaskedColumn - - -import rfinder +from astropy.coordinates import SkyCoord, EarthLocation, AltAz class rfi_stats: - def __init__(self): self.logger = logging.getLogger('log-rfinder.log')