Commit 40a14cb7 authored by Daniel Williams's avatar Daniel Williams
Browse files

Merge branc 'master' of github.com:transientlunatic/minke

parents f2724621 011f1045

minke/mdctools.py

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ class MDCSet(): 
        name = ''

        numberspart = ''

        if row.waveform == "Dimmelmeier+08":

            numberspart = self.numrel_data

            numberspart = row.numrel_data.split('.')[0]



        if row.waveform == "Gaussian":

            numberspart = "{:.3f}".format(row.duration * 1e3)
@@ -554,7 +554,7 @@ class Frame(): 


        head_date = str(self.start)[:5]

        frameloc = directory+"/"+mdc.directory_path()+"/"+head_date+"/"



        #print frameloc, filename

        if not os.path.isfile(frameloc + filename) or force:

            data = []

            # Define the start point of the time series top be generated for the injection

minke/sources.py

+7 −5
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ class Ott2013(Supernova): 
        self.sky_dist = sky_dist

    

        self.numrel_data = filepath + "/" + family + "theta{}_phi{}".format(theta, phi)



        self.params['numrel_data'] = self.numrel_data



class Mueller2012(Supernova):

    """
@@ -567,7 +567,7 @@ class Mueller2012(Supernova): 
        self.sky_dist = sky_dist

    

        self.numrel_data = filepath + "/" + family + "theta{}_phi{}".format(theta, phi)



        self.params['numrel_data'] = self.numrel_data





class Scheidegger2010(Supernova):
@@ -615,7 +615,9 @@ class Scheidegger2010(Supernova): 
        self.params['incl'] = theta

        self.sky_dist = sky_dist



        self.numrel_data = filepath + "/" + family #"theta{}_phi{}".format(theta, phi)

        self.numrel_data = filepath + "/" + family

        self.params['numrel_data'] = self.numrel_data

        #"theta{}_phi{}".format(theta, phi)



        #self.numrel_data = glob.glob(filepath + "/" + family + "*")