Move copyright statement from docstring to comments

database_builder/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
+"""
 This script is used the build pcigale internal database containing:
 - The various filter transmission tables;
 - The Maraston 2005 single stellar population (SSP) data;

pcigale/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
 __version__ = "0.1-alpha"
 
-
 import argparse
 from .session.configuration import Configuration
 from .stats.common import get_module as get_stats_module

pcigale/data/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
+"""
 This is the database where we store some data used by pcigale:
  - the information relative to the filters
  - the single stellar populations as defined in Marason (2005)

pcigale/data/agn_fritz2006.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 

pcigale/data/filters.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2012 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 

pcigale/data/ir_models_dl2007.py

-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Médéric Boquien <mederic.boquien@oamp.fr>
-
-"""
+## -*- coding: utf-8 -*-
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Médéric Boquien <mederic.boquien@oamp.fr>
 
 
 class DL2007(object):

pcigale/data/ir_templates_dh2002.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2012 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 from scipy import interpolate

pcigale/data/ssp_bc03.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C)  2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 

pcigale/data/ssp_m2005.py

-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+## -*- coding: utf-8 -*-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 

pcigale/sed/__init__.py

 # -*- coding: utf-8 -*-
-"""Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
+"""
 This class represents a Spectral Energy Distribution (SED) as used by pcigale.
 Such SED is characterised by:
 
@@ -36,7 +36,6 @@ Such SED is characterised by:
 
 """
 
-
 import numpy as np
 from . import utils
 from scipy.constants import c

pcigale/sed/modules/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2012 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 from .common import *

pcigale/sed/modules/bc03.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 from . import common

pcigale/sed/modules/casey2012.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Médéric Boquien <mederic.boquien@oamp.fr>
-
-"""
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Médéric Boquien <mederic.boquien@oamp.fr>
 
 import numpy as np
 import scipy.constants as cst
@@ -56,7 +52,7 @@ class Module(common.SEDCreationModule):
 
     def _init_code(self):
         """Build the model for a given set of parameters."""
-        
+
         T = float(self.parameters["temperature"])
         beta = float(self.parameters["beta"])
         alpha = float(self.parameters["alpha"])

pcigale/sed/modules/common.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
 from importlib import import_module
 
 

pcigale/sed/modules/dh2002.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 from . import common
 from ...data import Database

pcigale/sed/modules/dl2007.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Médéric Boquien <mederic.boquien@oamp.fr>
-
-"""
-
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Médéric Boquien <mederic.boquien@oamp.fr>
 
 from . import common
 import numpy as np

pcigale/sed/modules/dustatt_calzleit.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 from . import common

pcigale/sed/modules/dustatt_powerlaw.py

 # -*- coding: utf-8 -*-
-"""Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
+"""
 This module implements the attenuation base on a power law as defined
 in Charlot and Fall (2000) with a UV bump added.
 
 """
 
-
 import numpy as np
 from . import common
 from ...data import Database

pcigale/sed/modules/igmattenuation.py

-#-*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# -*- coding: utf-8 -*-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 from . import common

pcigale/sed/modules/lines.py

-#-*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Manuela Raimbault
 
-@author: Manuela Raimbault
-
-"""
 import numpy as np
 from scipy.constants import c
 from . import common

pcigale/sed/modules/loadfile.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import atpy
 from . import common

pcigale/sed/modules/m2005.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 from . import common

pcigale/sed/modules/sfh2exp.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import numpy as np
 from . import common

pcigale/sed/modules/sfhfromfile.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import atpy
 import numpy as np

pcigale/sed/utils.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-@author: Médéric Boquien <mederic.boquien@oamp.fr>
-
-"""
-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
+# Author: Médéric Boquien <mederic.boquien@oamp.fr>
 
 import numpy as np
 from scipy import integrate

pcigale/session/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2012 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>

pcigale/session/configuration.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
-
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import atpy
 import configobj

pcigale/session/tools.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2012 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 import itertools
 import collections

pcigale/stats/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2012 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>

pcigale/stats/common.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
 from importlib import import_module
 
 

pcigale/stats/psum.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
+"""
 This file implements the statistical analysis as performed by the calcX2_psum
 programme of the Fortran Cigale code.
 

pcigale/warehouse/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
 from json import JSONEncoder
 from ..sed import SED
 from ..sed.modules import common as sed_modules

pcigale/warehouse/store/__init__.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>

pcigale/warehouse/store/memory.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
 from copy import deepcopy
 
 

pcigale/warehouse/store/shelf.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Copyright (C) 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
 import shelve
 from copy import deepcopy
 

setup.py

 # -*- coding: utf-8 -*-
-"""
-Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
-Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
-
-@author: Yannick Roehlly <yannick.roehlly@oamp.fr>
-
-"""
+# Copyright (C) 2012, 2013 Centre de données Astrophysiques de Marseille
+# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
+# Author: Yannick Roehlly <yannick.roehlly@oamp.fr>
 
 from setuptools import setup, find_packages
 from distutils.command.build import build