Skip to content

Commit

Permalink
redoing some of the testing
Browse files Browse the repository at this point in the history
  • Loading branch information
wkerzendorf committed Oct 8, 2014
1 parent 150ce4b commit 217a19e
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
21 changes: 19 additions & 2 deletions specgrid/composite.py
Expand Up @@ -41,5 +41,22 @@ def evaluate(self, **kwargs):
setattr(self, kwarg, new_value)
return self()

def assemble_model_star(specgrid, spectrum=None, params=None):
pass
def assemble_model_star(spectral_grid, spectrum=None, normalize_pol=None, **kwargs):

for key in kwargs:
pass


convolve = InstrumentConvolve(R=self.spectral_parameters['R'])
#rot = RotationalBroadening()
doppler = DopplerShift()
interp = Interpolate(self.to_spectrum_1d())
one_chip_size = len(self.table['x'])
parts = [slice(None, one_chip_size),
slice(one_chip_size, 2*one_chip_size),
slice(2*one_chip_size, None)]
norm = NormalizeParts(self.to_spectrum_1d(), parts=parts,
npol=self.spectral_parameters['npol'])

model_star = ModelStar([spectral_grid, doppler, convolve, interp, norm])

11 changes: 11 additions & 0 deletions specgrid/tests/test_multinest.py
@@ -1,6 +1,8 @@
import numpy.testing as nptest
import numpy as np
import os

import pytest
from collections import OrderedDict

from specgrid import fitmultinest
Expand All @@ -10,6 +12,15 @@
from specgrid.base import BaseSpectralGrid
from specgrid.composite import ModelStar

try:
import pymultinest
except ImportError:
pymultinest_available = False
else:
pymultinest_available = True

pytestmark = pytest.mark.skipif(not pymultinest_available)

import specgrid

def data_path(filename):
Expand Down

0 comments on commit 217a19e

Please sign in to comment.