Commit ec83f0a2 authored by Akke Viitanen's avatar Akke Viitanen
Browse files

Adds logging to catalog_galaxy_agn

parent fc1be145

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -3,3 +3,9 @@ test: 
		python3 \

			src/python/main.py \

			--config etc/config_test.ini



debug:

	PYTHONPATH=opt:src/python:$(PYTHONPATH) \

		python3 -m pdb \

			src/python/main.py \

			--config etc/config_test.ini

etc/config_test.ini

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ zmin: 0.21 
zmax: 5.49



dirname_prefix: data/catalog/test/



log: ${common:dirname_prefix}/run.log



seds_file: ${common:dirname_prefix}/seds



bands:   [lsst-u,johnson-B,lsst-g,lsst-r,lsst-i,lsst-z,lsst-y,euclid-VIS,euclid-nisp-Y,euclid-nisp-J,euclid-nisp-H,spitzer-irac1,spitzer-irac2,spitzer-irac3,spitzer-irac4,wise-w1,wise-w2,wise-w3,wise-w4,mock-1000-4000,mock-1450,mock-4400,mock-5007,mock-15um,vista-Y,vista-J,vista-H,vista-Ks]

src/python/catalog_galaxy_agn.py

+75 −77

File changed.

Preview size limit exceeded, changes collapsed.

src/python/main.py

+68 −46
Original line number Diff line number Diff line
@@ -10,22 +10,16 @@ Create AGN mock catalogs in a script-like fashion 


import argparse

import configparser

import logging

import multiprocessing

import os



from egg import Egg

from catalog_galaxy_agn import CatalogGalaxyAGN

from plot import Plot



#from plot import Plot



# The user interface

parser = argparse.ArgumentParser()

parser.add_argument("--config", default="etc/config.ini")

args = parser.parse_args()



# Read in the config file

print("Reading in the config...")

config = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation())

config.read(args.config)

def main(config):



    # Create the initial EGG catalog

    print("Creating the EGG catalog...")
@@ -41,7 +35,6 @@ print("Writing the combined AGN+galaxy catalog...") 
    catalog.write(catalog.filename_catalog)



    ## Estimate the lightcurves

import multiprocessing

    args = [

        (i, f"lsst-{b}")

        for i in catalog[catalog["is_agn"]]["ID"]
@@ -52,7 +45,7 @@ with multiprocessing.Pool(40) as p: 




    # Create validation plots

if True:

    if False:

        p = Plot(config["figure"]["dirname"], catalog)

        p.plot()
@@ -67,3 +60,32 @@ if False: 
    if False:

        print("Writing the mock reference catalog...")

        catalog.write_reference_catalog(**config["reference_catalog"])





if __name__ == "__main__":



    # The user interface

    parser = argparse.ArgumentParser()

    parser.add_argument("--config", default="etc/config.ini")

    args = parser.parse_args()



    # Read in the config file

    print("Reading in the config...")

    config = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation())

    config.read(args.config)



    # Setup the directory

    if not os.path.exists(config["common"]["dirname_prefix"]):

        os.makedirs(config["common"]["dirname_prefix"])



    # Setup the logger

    logging.basicConfig(

        level=logging.INFO,

        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',

        handlers=[

            logging.StreamHandler(),

            logging.FileHandler(config["common"]["log"])

        ]

    )



    main(config)