From 3162a3d40618e3c9c888fe5ab192248f973e5897 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Sat, 26 Aug 2017 14:38:41 +0800 Subject: Return the list of filepath to the written sky files --- fg21sim/galactic/freefree.py | 8 ++++++++ fg21sim/galactic/snr.py | 8 ++++++++ fg21sim/galactic/synchrotron.py | 13 ++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) (limited to 'fg21sim/galactic') diff --git a/fg21sim/galactic/freefree.py b/fg21sim/galactic/freefree.py index d3c663f..16535ef 100644 --- a/fg21sim/galactic/freefree.py +++ b/fg21sim/galactic/freefree.py @@ -265,6 +265,11 @@ class FreeFree: The frequencies where to simulate the emission map. Unit: [MHz] Default: None (i.e., use ``self.frequencies``) + + Returns + ------- + skyfiles : list[str] + List of the filepath to the written sky files """ if frequencies is None: frequencies = self.frequencies @@ -272,11 +277,14 @@ class FreeFree: frequencies = np.array(frequencies, ndmin=1) logger.info("Simulating {name} ...".format(name=self.name)) + skyfiles = [] for freq in frequencies: sky = self.simulate_frequency(freq) outfile = self._outfilepath(frequency=freq) sky.write(outfile) + skyfiles.append(outfile) logger.info("Done simulate {name}!".format(name=self.name)) + return skyfiles def postprocess(self): """Perform the post-simulation operations before the end.""" diff --git a/fg21sim/galactic/snr.py b/fg21sim/galactic/snr.py index e77e24e..74b9525 100644 --- a/fg21sim/galactic/snr.py +++ b/fg21sim/galactic/snr.py @@ -400,6 +400,11 @@ class SuperNovaRemnants: The frequencies where to simulate the foreground map. Unit: [MHz] Default: None (i.e., use ``self.frequencies``) + + Returns + ------- + skyfiles : list[str] + List of the filepath to the written sky files """ if frequencies is None: frequencies = self.frequencies @@ -407,11 +412,14 @@ class SuperNovaRemnants: frequencies = np.array(frequencies, ndmin=1) logger.info("Simulating {name} ...".format(name=self.name)) + skyfiles = [] for freq in frequencies: sky = self.simulate_frequency(freq) outfile = self._outfilepath(frequency=freq) sky.write(outfile) + skyfiles.append(outfile) logger.info("Done simulate {name}!".format(name=self.name)) + return skyfiles def postprocess(self): """Perform the post-simulation operations before the end.""" diff --git a/fg21sim/galactic/synchrotron.py b/fg21sim/galactic/synchrotron.py index f2de2ce..2d1a59f 100644 --- a/fg21sim/galactic/synchrotron.py +++ b/fg21sim/galactic/synchrotron.py @@ -191,14 +191,13 @@ class Synchrotron: sky = self.sky.copy() sky.frequency = frequency ff = frequency / self.template_freq - data = self.template * ff ** (-np.abs(self.indexmap)) - sky.data = data + sky.data = self.template * ff ** (-np.abs(self.indexmap)) logger.info("Done simulate map at %.2f [MHz]." % frequency) return sky def simulate(self, frequencies=None): """ - Simulate the synchrotron map at the specified frequencies. + Simulate the synchrotron maps. Parameters ---------- @@ -206,6 +205,11 @@ class Synchrotron: The frequencies where to simulate the foreground map. Unit: [MHz] Default: None (i.e., use ``self.frequencies``) + + Returns + ------- + skyfiles : list[str] + List of the filepath to the written sky files """ if frequencies is None: frequencies = self.frequencies @@ -213,11 +217,14 @@ class Synchrotron: frequencies = np.array(frequencies, ndmin=1) logger.info("Simulating {name} ...".format(name=self.name)) + skyfiles = [] for freq in frequencies: sky = self.simulate_frequency(freq) outfile = self._outfilepath(frequency=freq) sky.write(outfile) + skyfiles.append(outfile) logger.info("Done simulate {name}!".format(name=self.name)) + return skyfiles def postprocess(self): """Perform the post-simulation operations before the end.""" -- cgit v1.2.2