Skip to content

Commit

Permalink
Changes to import statements made, now compiles in clean env. Take 12
Browse files Browse the repository at this point in the history
  • Loading branch information
DinoBektesevic committed Jan 15, 2019
1 parent 003f7fc commit 4992cea
Show file tree
Hide file tree
Showing 26 changed files with 67 additions and 67 deletions.
8 changes: 4 additions & 4 deletions lfd/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
BOSS_PHOTOOBJ = None


from . import detecttrails
from . import createjobs
from . import gui
from . import results
from lfd import detecttrails
from lfd import createjobs
from lfd import gui
from lfd import results

def setup_detecttrails(bosspath=BOSS, photoobjpath=BOSS_PHOTOOBJ,
photoreduxpath=PHOTO_REDUX, debugpath=None):
Expand Down
2 changes: 1 addition & 1 deletion lfd/analysis/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#import .profiles
from lfd.analysis import profiles
12 changes: 6 additions & 6 deletions lfd/analysis/profiles/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"""


from .seeing import *
from .consts import *
from .plotutils import *
from .convolution import *
from .objectprofiles import *
from .convolutionobj import ConvolutionObject
from lfd.analysis.profiles.seeing import *
from lfd.analysis.profiles.consts import *
from lfd.analysis.profiles.plotutils import *
from lfd.analysis.profiles.convolution import *
from lfd.analysis.profiles.objectprofiles import *
from lfd.analysis.profiles.convolutionobj import ConvolutionObject

2 changes: 1 addition & 1 deletion lfd/analysis/profiles/convolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""
import numpy as np
from scipy import misc, signal, interpolate, stats
from .convolutionobj import ConvolutionObject
from lfd.analysis.profiles.convolutionobj import ConvolutionObject

__all__ = ["largest_common_scale", "convolve_seeing", "convolve_defocus",
"convolve_seeing_defocus", "convolve"]
Expand Down
4 changes: 2 additions & 2 deletions lfd/analysis/profiles/objectprofiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from scipy import stats
import cv2

from .convolutionobj import ConvolutionObject
from .consts import *
from lfd.analysis.profiles.convolutionobj import ConvolutionObject
from lfd.analysis.profiles.consts import *

__all__ = ["PointSource", "GaussianSource", "DiskSource", "RabinaSource"]

Expand Down
16 changes: 8 additions & 8 deletions lfd/analysis/profiles/plotutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import matplotlib as mpl
import numpy as np

from .convolutionobj import ConvolutionObject
from .convolution import convolve
from .objectprofiles import *
from .seeing import *
from lfd.analysis.profiles.convolutionobj import ConvolutionObject
from lfd.analysis.profiles.convolution import convolve
from lfd.analysis.profiles.objectprofiles import *
from lfd.analysis.profiles.seeing import *

__all__ = ["plot_profiles"]

Expand All @@ -18,7 +18,7 @@ def plot_profiles(ax, profiles, *args, normed=True, **kwargs):
normed to False if normalization is not desired. Lables are determined from
the name attribute of the profile. `*args` and `**kwargs` are forwarded to
the matplotlib plot function.
"""
for profile in profiles:
if normed:
Expand All @@ -35,14 +35,14 @@ def plot_profiles(ax, profiles, *args, normed=True, **kwargs):
# d = FluxPerAngle(h, *sdss)
#
# ofwhm = o.calc_fwhm()
#
#
# c = convolve(o, d)
# dfwhm1 = c.calc_fwhm()
#
# o = o = RabinaProfile("Rabina/img15_r.png", h)
# s = GausKolmogorov(sdssseeing)
# d = FluxPerAngle(h, *sdss)
#
#
# c = convolve(o, s, d)
# obsfwhm1 = c.calc_fwhm()
#
Expand All @@ -57,7 +57,7 @@ def plot_profiles(ax, profiles, *args, normed=True, **kwargs):
# o = RabinaProfile("Rabina/img15_r.png", h)
# s = GausKolmogorov(lsstseeing)
# d = FluxPerAngle(h, *lsst)
#
#
# c = convolve(o, s, d)
# obsfwhm2 = c.calc_fwhm()
#
Expand Down
4 changes: 2 additions & 2 deletions lfd/analysis/profiles/seeing.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"""
import numpy as np

from .convolutionobj import ConvolutionObject
from .consts import *
from lfd.analysis.profiles.convolutionobj import ConvolutionObject
from lfd.analysis.profiles.consts import *

import copy

Expand Down
6 changes: 3 additions & 3 deletions lfd/detecttrails/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ def setup(bosspath, photoobjpath, photoreduxpath, debugpath):
lfd.PHOTO_REDUX = photoreduxpath


from .removestars import *
from .processfield import *
from .detecttrails import *
from lfd.detecttrails.removestars import *
from lfd.detecttrails.processfield import *
from lfd.detecttrails.detecttrails import *
8 changes: 4 additions & 4 deletions lfd/detecttrails/detecttrails.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

import bz2

from .removestars import * #remove_stars
from .processfield import * #process_field_bright, process_field_dim
from .processfield import setup_debug
from .sdss import files
from lfd.detecttrails.removestars import * #remove_stars
from lfd.detecttrails.processfield import * #process_field_bright, process_field_dim
from lfd.detecttrails.processfield import setup_debug
from lfd.detecttrails.sdss import files

__all__ = ["DetectTrails", "process_field"]

Expand Down
Empty file removed lfd/detecttrails/errors.txt
Empty file.
Empty file removed lfd/detecttrails/results.txt
Empty file.
4 changes: 2 additions & 2 deletions lfd/gui/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .imagechecker import imagechecker
from .jobcreator import jobcreator
from lfd.gui.imagechecker import imagechecker
from lfd.gui.jobcreator import jobcreator
2 changes: 1 addition & 1 deletion lfd/gui/imagechecker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
locally. ImageChecker was designed to facilitate fast verification and
correction of results and was not intended to be, yet another, FITS viewer.
"""
from . import imagechecker
from lfd.gui.imagechecker import imagechecker
4 changes: 2 additions & 2 deletions lfd/gui/imagechecker/databrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"""
import os

from .indexers import ImageIndexer, EventIndexer
from .imagedb import session_scope
from lfd.gui.imagechecker.indexers import ImageIndexer, EventIndexer
from lfd.gui.imagechecker.imagedb import session_scope

class GenericBrowser(type):
"""GenericBrowser metaclass offers the ability to rename the values of
Expand Down
2 changes: 1 addition & 1 deletion lfd/gui/imagechecker/imagechecker.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from tkinter import Label
from tkinter import filedialog

from .databrowser import ImageBrowser, EventBrowser
from lfd.gui.imagechecker.databrowser import ImageBrowser, EventBrowser

class ImageChecker(Tk):
"""GUI app that allows for visual inspection of Events. To run the app
Expand Down
4 changes: 2 additions & 2 deletions lfd/gui/imagechecker/indexers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from lfd import results as res
from lfd.results import Event

from . import imagedb
from .imagedb import Image
from lfd.gui.imagechecker import imagedb
from lfd.gui.imagechecker.imagedb import Image

class Indexer:
"""Generic indexer of items in a database. Given a list of items or a
Expand Down
4 changes: 2 additions & 2 deletions lfd/gui/imagechecker/rightframe.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from tkinter import *
from tkinter.ttk import *

from .topright import TopRight
from .botright import BottomRight
from lfd.gui.imagechecker.topright import TopRight
from lfd.gui.imagechecker.botright import BottomRight

class RightFrame(Frame):
"""Represents the right part of the frame containing all the action buttons
Expand Down
2 changes: 1 addition & 1 deletion lfd/gui/imagechecker/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import glob

import lfd.results as res
from . import imagedb
from lfd.gui.imagechecker import imagedb


def frameId2Filename(run, camcol, filter, field, type=".png"):
Expand Down
2 changes: 1 addition & 1 deletion lfd/gui/jobcreator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
the createjobs module and has additional practical features such as
in-place template editing.
"""
from . import jobcreator
from lfd.gui.jobcreator import jobcreator
4 changes: 2 additions & 2 deletions lfd/gui/jobcreator/jobcreator.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# -*- coding: utf-8 -*-
import os

from .leftframe import LeftFrame
from .rightframe import RightFrame
from lfd.gui.jobcreator.leftframe import LeftFrame
from lfd.gui.jobcreator.rightframe import RightFrame
from lfd.gui.utils import utils

from tkinter import *
Expand Down
6 changes: 3 additions & 3 deletions lfd/gui/jobcreator/leftframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
from tkinter.ttk import *
from tkinter import messagebox

from .lefttopframe import TopFrame
from .leftmidframe import MidFrame
from .leftbotframe import BotFrame
from lfd.gui.jobcreator.lefttopframe import TopFrame
from lfd.gui.jobcreator.leftmidframe import MidFrame
from lfd.gui.jobcreator.leftbotframe import BotFrame

import lfd.createjobs as cj

Expand Down
14 changes: 7 additions & 7 deletions lfd/results/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@

Base = _declarative_base()

from .event import *
from .frame import *
from .point import *
from lfd.results.event import *
from lfd.results.frame import *
from lfd.results.point import *

from .basictime import *
from .ccd_dimensions import *
from .coord_conversion import *
from lfd.results.basictime import *
from lfd.results.ccd_dimensions import *
from lfd.results.coord_conversion import *

Session, engine = None, None
def connect2db(uri, echo=False):
Expand Down Expand Up @@ -78,7 +78,7 @@ def connect2db(uri, echo=False):
# create a Session object so transactions can be made
Session = _sessionmaker(bind=engine)

from .utils import *
from lfd.results.utils import *

del event, frame, point, basictime
del ccd_dimensions, coord_conversion
2 changes: 1 addition & 1 deletion lfd/results/coord_conversion.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from . import ccd_dimensions as ccd
from lfd.results import ccd_dimensions as ccd


__all__ = ["convert_ccd2frame", "convert_frame2ccd",
Expand Down
10 changes: 5 additions & 5 deletions lfd/results/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

from astropy.time import Time

from . import Base
from . import __query_aliases as query_aliases
from .point import Point
from .basictime import BasicTime, LineTime
from .utils import session_scope
from lfd.results import Base
from lfd.results import __query_aliases as query_aliases
from lfd.results.point import Point
from lfd.results.basictime import BasicTime, LineTime
from lfd.results.utils import session_scope

__all__ = ["Event"]

Expand Down
8 changes: 4 additions & 4 deletions lfd/results/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

from astropy.time import Time

from . import Base
from . import __query_aliases as query_aliases
from .basictime import BasicTime
from .utils import session_scope
from lfd.results import Base
from lfd.results import __query_aliases as query_aliases
from lfd.results.basictime import BasicTime
from lfd.results.utils import session_scope

__all__ = ["Frame"]

Expand Down
4 changes: 2 additions & 2 deletions lfd/results/point.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@

from sqlalchemy.ext.mutable import MutableComposite

from .coord_conversion import (convert_ccd2frame, convert_frame2ccd,
CoordinateConversionError)
from lfd.results.coord_conversion import (convert_ccd2frame, convert_frame2ccd,
CoordinateConversionError)

__all__ = ["Point"]

Expand Down

0 comments on commit 4992cea

Please sign in to comment.