Commit a56edd1d authored by Daniel Williams's avatar Daniel Williams
Browse files

New version of MDC tools.

parent 095e58a2

minke/mdctools.py

+16 −5
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ from pylal import Fr 


import numpy as np

import pandas as pd

import matplotlib.pyplot as plt

import os
@@ -38,7 +37,8 @@ class MDCSet(): 


    inj_families_names = {'ga' : 'Gaussian',

                          'sg' : 'SineGaussian',

                          'wnb': 'BTLWNB'

                          'wnb': 'BTLWNB',

                          'd08' : 'Dimmelmeier+08'

                          }



    inj_families_abb = dict((v,k) for k,v in inj_families_names.iteritems())
@@ -46,7 +46,8 @@ class MDCSet(): 
    hist_parameters = {

        "SineGaussian": ["hrss", "psi", "ra", "dec"],

        "Gaussian": ["hrss", "psi", "ra", "dec"],

        "BTLWNB": ["hrss", "ra", "dec"]

        "BTLWNB": ["hrss", "ra", "dec"],

        "Dimmelmeier+08": ['hrss', 'ra', 'dec']

    }
@@ -68,6 +69,11 @@ class MDCSet(): 
        self.egw = []

        self.times = []

        while True:

            # This is an ugly kludge to get around the poor choice of wavform name in the xmls, and

            if sim_burst_table.waveform[:3]=="s15": 

                self.numrel_file = str(sim_burst_table.waveform)

                sim_burst_table.waveform = "Dimmelmeier+08"



            self.waveforms.append(sim_burst_table)

            self._generate_burst(sim_burst_table)

            self._measure_hrss()
@@ -114,6 +120,8 @@ class MDCSet(): 
            except TypeError: 

                print a, getattr(row,a)

                continue # the structure is different than the TableRow

        #print row.numrel_data

        self.swig_row.numrel_data = row.numrel_data

        hp, hx = lalburst.GenerateSimBurst(self.swig_row, 1.0/rate)

        # FIXME: Totally inefficent --- but can we deep copy a SWIG SimBurst?

        # DW: I tried that, and it doesn't seem to work :/
@@ -181,7 +189,8 @@ class MDCSet(): 
           the folder structure

        """

        name = self._simID(0)

        return "{}/{}".format(name[:2], name)

        abb = self.inj_families_abb[self.waveforms[0].waveform].lower()

        return "{}/{}".format(abb, name)

        

        

    def _simID(self, row):
@@ -200,6 +209,9 @@ class MDCSet(): 
        """

        row = self.waveforms[row]

        name = ''

        numberspart = ''

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

            numberspart = self.numrel_file



        if row.waveform == "Gaussian":

            numberspart = "{:.3f}".format(row.duration * 1e3)
@@ -211,7 +223,6 @@ class MDCSet(): 
            numberspart = "f{:.0f}_q{:.0f}_{}".format(row.frequency, row.q, pol)

        elif row.waveform == "BTLWNB":

            numberspart = "{}b{}tau{}".format(row.frequency, row.bandwidth, row.duration)

        

        name += '{}_{}'.format(self.inj_families_abb[row.waveform].lower(), numberspart).replace('.','d')



        return name