Commit 38cf6bca authored by Daniel Williams's avatar Daniel Williams
Browse files

Tidied up the Scheidegger implementation slightly

parent 24170d1a

minke/sources.py

+10 −8
Original line number Original line Diff line number Diff line
@@ -523,19 +523,21 @@ class Scheidegger2010(Supernova): 
        self._clear_params()

        self._clear_params()

        self.time = time

        self.time = time

        self.params['phi'] = phi

        self.params['phi'] = phi

        self.params['incl'] = incl

        self.params['incl'] = theta

        self.sky_dist = sky_dist

        self.sky_dist = sky_dist

    

    

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

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



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





        # Parse the file names to get the theta, phi tuples 

        # Parse the file names to get the theta, phi tuples 

        self.combinations = []

        #self.combinations = []

        for file in self.numrel_data:

        #for file in self.numrel_data:

            self.combinations.append(re.match(r".*theta([\d.]*)_phi([\d.]*)", file).groups())

        #    self.combinations.append(re.match(r".*theta([\d.]*)_phi([\d.]*)", file).groups())

        # Find all the unique entries

        # Find all the unique entries

        self.combinations = set(self.combinations)

        #self.combinations = set(self.combinations)

        if not (theta, phi) in self.combinations:

        #if not (theta, phi) in self.combinations:

            raise IOError("There is no file for this combination of rotations.")

        #    raise IOError("There is no file for this combination of rotations.")