Commit 9cde3561 authored by Daniel Williams's avatar Daniel Williams
Browse files

Added destructors for the swig objects.

parent 2db526ad

minke/mdctools.py

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ class MDCSet(): 
        # DW: I tried that, and it doesn't seem to work :/

        hp0, hx0 = lalburst.GenerateSimBurst(self.swig_row, 1.0/rate)

        self.hp, self.hx, self.hp0, self.hx0 = hp, hx, hp0, hx0

        lalburst.DestroySimBurst(self.swig_row)

    

    def _getDetector(self, det):

        """

minke/sources.py

+13 −3
Original line number Diff line number Diff line
@@ -42,6 +42,15 @@ class Waveform(object): 
    waveform = "Generic"

    expnum = 1



    def __del__(self):

        try:

            lal.DestroyREAL8Sequence(self.hp)

            lal.DestroyREAL8Sequence(self.hx)

            lal.DestroyREAL8Sequence(self.hp0)

            lal.DestroyREAL8Sequence(self.hx0)

        except:

            pass

    

    def _clear_params(self):

        self.params = {}

        for a in lsctables.SimBurstTable.validcolumns.keys():
@@ -136,7 +145,8 @@ class Waveform(object): 
        else:

            hp0, hx0 = hp, hx

        self.hp, self.hx, self.hp0, self.hx0 = hp, hx, hp0, hx0

        return hp, hx, hp0, hx0

        lalburst.DestroySimBurst(self.swig_row)

        #return hp, hx, hp0, hx0



    def _row(self, sim=None, slide_id=1):

        """
@@ -357,8 +367,8 @@ class WhiteNoiseBurst(Waveform): 
        # the old pyBurst code measured this by generating the waveform

        # which seems wasteful, but I'll replicate it here anyway, for

        # consistency with the method used for O1.

        #hp, hx, _, _ = self._generate(half=True)

        #self.params['hrss'] =  lalsimulation.MeasureHrss(hp, hx)

        self._generate(half=True)

        self.params['hrss'] =  lalsimulation.MeasureHrss(self.hp, self.hx)





class Supernova(Waveform):