chanter 0.0.3__tar.gz → 0.0.4__tar.gz

{chanter-0.0.3 → chanter-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: chanter
-Version: 0.0.3
+Version: 0.0.4
 Summary: Galaxy spectral fitting
 Author: Struan Stevenson
 Author-email: struan.stevenson@ed.ac.uk

{chanter-0.0.3 → chanter-0.0.4}/chanter/galaxy_fitter.py

@@ -20,6 +20,7 @@ class galaxyfitter(object):
         model = modelgalaxy(fit_instruc)
         wavs, flux = model.get_spectrum()
         effwavs, phot = model.get_photometry(wavs, flux, filt_files)
+
         return phot
 
     # Liklihood function for a certain point in parameter space
@@ -73,14 +74,13 @@ class galaxyfitter(object):
         # Run fitter
         t0 = time.time()
 
-        print('Computing '+str(id)+'...')
         # Load data
         dat= photdata.T
         dat[0] = 2.99792458E-05 * ((1e-6 * dat[0]) / ((effwavs)**2))
         dat[1] = 2.99792458E-05 * ((1e-6 * dat[1]) / ((effwavs)**2))
 
         # Run the nested sampler over the likelihood function
-        sampler = Sampler(prior, lambda param_dict: self.log_likelihood(dat, self.gen_phot, filt_files, param_dict))
+        sampler = Sampler(prior, lambda param_dict: self.log_likelihood(dat, self.gen_phot, filt_files, param_dict), n_live=1000)
         success = sampler.run(verbose=True, discard_exploration=True, timeout=1800)
 
         # Plot results

{chanter-0.0.3 → chanter-0.0.4}/chanter/model_galaxy.py

@@ -50,7 +50,7 @@ def resample_igm_grid(wavs):
 hdul = fits.open(os.path.dirname(os.path.realpath(__file__)) + '/grids/ssps.fits')
 master_base = np.array((hdul[1].data, hdul[2].data, hdul[3].data, hdul[4].data, hdul[5].data, hdul[6].data, hdul[7].data))
 
-rest_target_wavs = np.arange(100., 50000., 10.)
+rest_target_wavs = np.arange(100., 50000., 25.)
 grid = resample_ssp_wavs(rest_target_wavs)
 igm_grid = resample_igm_grid(rest_target_wavs)
 
@@ -225,22 +225,25 @@ class modelgalaxy(object):
 
         self.get_spectrum()
 
-        ax.step(self.wavs, self.flux, **kwargs)
+        ax.plot(self.wavs, self.flux, **kwargs)
         ax.set_ylabel('Observed Flux / erg s$^{-1}$ cm$^{-2}$ Å$^{-1}$')
         ax.set_xlabel('Observed Wavelength / Å')
     
 
     
-    def plot_sfh(self):
+    def plot_sfh(self, ax):
         ssp_age = grid[0].T[0, 1:]        
         sfrs = self.sfr(ssp_age, self.fit_instructions["exponential"]["age"], self.fit_instructions["exponential"]["tau"], self.fit_instructions["exponential"]["massformed"])
-        fig, ax = plt.subplots()
+
         ax.set_xlabel('Age / Gyr')
         ax.set_ylabel(' Star Formation / M$_{sun}$ Gyr$^{-1}$')
-        ax.plot((self.universe_age-self.lookback_time) - ssp_age, sfrs/1e9, color='black')
+        ax.plot((self.universe_age-self.lookback_time) - ssp_age, sfrs/1e9, color='black', lw=1)
+        ax.axvline((self.universe_age-self.lookback_time) - ssp_age[0], 0, 1, color='black', ls='dashed', lw=1)
+
+        #ax.plot(-ssp_age, sfrs/1e9, color='black')
         ax.invert_xaxis()
+        ax.set_xlim(self.universe_age,0)
         ax.set_ylim(0, )
-        return fig, ax
     
 
 

{chanter-0.0.3 → chanter-0.0.4}/chanter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: chanter
-Version: 0.0.3
+Version: 0.0.4
 Summary: Galaxy spectral fitting
 Author: Struan Stevenson
 Author-email: struan.stevenson@ed.ac.uk

{chanter-0.0.3 → chanter-0.0.4}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 setup(
     name='chanter',
 
-    version='0.0.3',
+    version='0.0.4',
 
     description='Galaxy spectral fitting',
 
@@ -14,7 +14,7 @@ setup(
 
     packages= setuptools.find_packages(),
 
-    #package_data = {'': ['*.txt', '*.fits'],},  
+    package_data = {'': ['*.txt', '*.fits'],},  
 
     install_requires=["numpy", "astropy", "matplotlib", "spectres", "nautilus-sampler"],