Commit 7e936912 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

add galaxy rotation function to C6_50sqdeg.py by 

rotate e1, e2.
remove the rotation parameter in Galaxy class (not used before).
modeling of ellpiticity rotation should be implemented in Catalog.py
parent 14bdd76b

Catalog/C6_50sqdeg.py

+7 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import h5py as h5 
import healpy as hp

import astropy.constants as cons

import traceback

import cmath

from astropy.coordinates import spherical_to_cartesian

from astropy.table import Table

from scipy import interpolate
@@ -107,7 +108,7 @@ class Catalog(CatalogBase): 
            self.AGN_SED_path = os.path.join(config["data_dir"], config["catalog_options"]["SED_templates_path"]["AGN_SED"])



        if "rotateEll" in config["catalog_options"]:

            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))

            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))

        else:

            self.rotation = 0.
@@ -225,6 +226,10 @@ class Catalog(CatalogBase): 
            param['ell_total'] = np.sqrt(param['e1']**2 + param['e2']**2)

            if param['ell_total'] > 0.9:

                continue

            phi_e = cmath.phase(complex(param['e1'], param['e2']))

            param['e1'] = param['ell_total'] * np.cos(phi_e + 2*self.rotation)

            param['e2'] = param['ell_total'] * np.sin(phi_e + 2*self.rotation)

            

            param['e1_disk'] = param['e1']

            param['e2_disk'] = param['e2']

            param['e1_bulge'] = param['e1']
@@ -285,7 +290,7 @@ class Catalog(CatalogBase): 
            param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)

            

            if param['star'] == 0:

                obj = Galaxy(param, self.rotation, logger=self.logger)

                obj = Galaxy(param, logger=self.logger)

            elif param['star'] == 2:

                obj = Quasar(param, logger=self.logger)

Catalog/C6_Catalog.py

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ class Catalog(CatalogBase): 
            self._load_SED_lib_AGN()



        if "rotateEll" in config["catalog_options"]:

            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))

            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))

        else:

            self.rotation = 0.
@@ -259,7 +259,7 @@ class Catalog(CatalogBase): 
            param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)

            

            if param['star'] == 0:

                obj = Galaxy(param, self.rotation, logger=self.logger)

                obj = Galaxy(param, logger=self.logger)

            

            # Need to deal with additional output columns

            obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

Catalog/C6_fits_Catalog.py

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class Catalog(CatalogBase): 
        ###mock_stamp_END

        

        if "rotateEll" in config["catalog_options"]:

            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))

            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))

        else:

            self.rotation = 0.
@@ -272,7 +272,7 @@ class Catalog(CatalogBase): 
            param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)

            

            if param['star'] == 0:

                obj = Galaxy(param, self.rotation, logger=self.logger)

                obj = Galaxy(param, logger=self.logger)

            

            # Need to deal with additional output columns

            obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

Catalog/FGS_Catalog.py

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class Catalog(CatalogBase): 
            self._load_SED_lib_AGN()



        if "rotateEll" in config["catalog_options"]:

            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))

            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))

        else:

            self.rotation = 0.
@@ -260,7 +260,7 @@ class Catalog(CatalogBase): 
            param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)

            

            if param['star'] == 0:

                obj = Galaxy(param, self.rotation, logger=self.logger)

                obj = Galaxy(param, logger=self.logger)

            

            # Need to deal with additional output columns

            obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

Catalog/NGPCatalog.py

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class Catalog(CatalogBase): 
            self.galaxy_SED_path = os.path.join(config["data_dir"], config["catalog_options"]["SED_templates_path"]["galaxy_SED"])

            self._load_SED_lib_gals()

        if "rotateEll" in config["catalog_options"]:

            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))

            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))

        else:

            self.rotation = 0.
@@ -191,7 +191,7 @@ class Catalog(CatalogBase): 
            param['id'] = gals['galaxyID'][igals]

            

            if param['star'] == 0:

                obj = Galaxy(param, self.rotation, logger=self.logger)

                obj = Galaxy(param, logger=self.logger)

            if param['star'] == 2:

                obj = Quasar(param, logger=self.logger)