Merge pull request #14 from jason-neal/develop

Get docs branch up to date with develop.

.gitignore

@@ -1,3 +1,6 @@
+#sync
+.sync/
+
 #notebook and html
 #*.ipynb
 *.html

.travis.yml

@@ -23,7 +23,7 @@ before_install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-install:  
+install:
   #- conda install --yes python=$TRAVIS_PYTHON_VERSION  numpy scipy matplotlib #nose atlas dateutil pandas statsmodels
   # Coverage packages are on my binstar channel
   #- conda install --yes -c dan_blanchard python-coveralls nose-cov
@@ -32,19 +32,19 @@ install:
   - python setup.py install
 
 
-  - pip install python-coveralls
-  - pip install pytest-cov
-# install:  
+  - pip install pytest-cov python-coveralls
+  - pip install -r requirements.txt
+# install:
 #  -  pip install numpy
 #  -  pip install tox
 #  -  pip install matplotlib
 #  -  pip install hypothesis
 
 # command to run tests
-script: 
+script:
   # - py.test -cov coveralls --cov-report term-missing
   # - py.test --cov=spectrum_overload spectrum_overload/ --cov-report term-missing
   - py.test --cov=spectrum_overload --cov-report term-missing
 
 after_success:
-  - coveralls
+  - coveralls

requirements.txt

@@ -0,0 +1,8 @@
+pyastronomy
+numpy
+astropy
+scipy
+hypothesis
+pytest
+pytest-cov
+python-coveralls

spectrum_overload/Differential.py

@@ -0,0 +1,42 @@
+"""Differential Class which takes the difference between two spectral types."""
+from spectrum_overload.Spectrum import Spectrum
+# Begin Feburary 2017
+
+
+class DifferentialSpectrum(object):
+    """Make differential spectrum."""
+
+    def __init__(self, Spectrum1, Spectrum2):
+        """Initalise lass with both spectra."""
+        if not(Spectrum1.calibrated and Spectrum2.calibrated):
+            raise ValueError("Input spectra are not calibrated.")
+
+        self.spec1 = Spectrum1
+        self.spec2 = Spectrum2
+        self.params = None
+        self.diff = None
+
+    def barycentric_correct(self):
+        """Barycentic correct each spectra."""
+        pass
+
+    def rest_frame(self, frame):
+        """Change restframe to one of the spectra."""
+        pass
+
+    def diff(self):
+        """Calculate difference between the two spectra."""
+        # TODO: Access interpolations
+        return self.spec1 - self.spec2
+
+    def sort(self, method="time"):
+        """Sort spectra in specific order. e.g. time, reversed."""
+        pass
+
+    def swap(self):
+        """Swap order of the two spectra."""
+        self.spec1, self.spec2 = self.spec2, self.spec1
+
+    def add_orbital_params(self, params):
+        """Acecpt dictionary of orbital parameters to use for shifting frames."""
+        self.params = params