Rename `center` to `centre` everywhere.

(I chose `centre` because there were more `centre` than `center` around.)

Rename `center` to `centre` everywhere.
(I chose `centre` because there were more `centre` than `center` around.)
Christoph Deil
1 parent 808c9fdd
Showing 16 changed files with 47 additions and 47 deletions
doc/source/user_manual/glossary.rst
doc/source/user_manual/modules/support.rst
include/GTools.hpp
inst/cta/src/GCTAModelBackground.cpp
inst/cta/test/test_CTA.cpp
inst/cta/test/test_irf_offset.py
inst/cta/test/test_model.py
pyext/GLog.i
pyext/GTools.i
src/app/GApplication.cpp
src/sky/GSkyRegionCircle.cpp
src/support/GTools.cpp
test/example_model_xml_io.py
test/example_radial_models.py
test/test_GApplication.py
test/test_GSky.cpp
@@ -21,7 +21,7 @@ Glossary
 -  **HEASARC** (`<http://heasarc.gsfc.nasa.gov/>`_)
-   High Energy Astrophysics Science Archive Research Center.
+   High Energy Astrophysics Science Archive Research Centre.
 -  **Python** (`<http://www.python.org/>`_)
@@ -211,7 +211,7 @@ Function                       Description
 ``gammalib::fill``             Fill string with a number of replications of a string.
 ``gammalib::left``             Left justify string to achieve a given length of characters.
 ``gammalib::right``            Right justify string to achieve a given length of characters.
-``gammalib::center``           Center string to achieve a given length of characters.
+``gammalib::centre``           Centre string to achieve a given length of characters.
 ``gammalib::parformat``        Format string for parameter value display.
 ``gammalib::plaw_photon_flux`` Compute photon flux under a power law.
 ``gammalib::plaw_energy_flux`` Compute energy flux under a power law.
@@ -76,7 +76,7 @@ namespace gammalib {
                                   const char& c = ' ');
     std::string              right(const std::string& s, const int& n,
                                    const char& c = ' ');
-    std::string              center(const std::string& s, const int& n,
+    std::string              centre(const std::string& s, const int& n,
                                     const char& c = ' ');
     std::string              parformat(const std::string& s, const int& indent = 0);
     double                   plaw_photon_flux(const double& emin,
@@ -1196,7 +1196,7 @@ GModelTemporal* GCTAModelBackground::xml_temporal(const GXmlElement&amp; temporal) c
 /***********************************************************************//**
  * @brief Kernel for zenith angle Npred integration of background model
  *
- * @param[in] theta Offset angle from ROI center (radians).
+ * @param[in] theta Offset angle from ROI centre (radians).
  *
  * Computes
  *
@@ -362,7 +362,7 @@ void TestGCTAResponse::test_response_irf_diffuse(void)
     GEnergy  emax(100.0, "TeV");
     GEbounds ebounds(nebins, emin, emax);
-    // Setup event cube centered on Cen A
+    // Setup event cube centreed on Cen A
     GCTAEventCube cube(map, ebounds, gti);
     // Setup dummy CTA observation
@@ -515,7 +515,7 @@ void TestGCTAModelBackground::test_modelbg_npred(void)
     const GModelSpectralPlaw*       spec = dynamic_cast<const GModelSpectralPlaw*>(bck->spectral());
     const GModelSpatialRadialGauss* spat = dynamic_cast<const GModelSpatialRadialGauss*>(bck->spatial());
-    // Get Integration center for ROI position
+    // Get Integration centre for ROI position
     double src_ra  = spat->ra();
     double src_dec = spat->dec();
     double sigma   = spat->sigma();
@@ -57,11 +57,11 @@ def shell_model(ra=0.3, dec=0.3, radius=0.3, width=0.1):
     Set shell model.
     """
     # Set shell centre
-    center = GSkyDir()
-    center.radec_deg(ra, dec)
+    centre = GSkyDir()
+    centre.radec_deg(ra, dec)
     # Set radial model
-    radial = GModelRadialShell(center, radius, width, False)
+    radial = GModelRadialShell(centre, radius, width, False)
     # Set spectral model
     spectral = GModelSpectralPlaw(1.0, -2.0)
@@ -81,11 +81,11 @@ def disk_model(ra=359.6, dec=-0.2, radius=0.4):
     Set disk model.
     """
     # Set disk centre
-    center = GSkyDir()
-    center.radec_deg(ra, dec)
+    centre = GSkyDir()
+    centre.radec_deg(ra, dec)
     # Set radial model
-    radial = GModelRadialDisk(center, radius)
+    radial = GModelRadialDisk(centre, radius)
     # Set spectral model
     spectral = GModelSpectralPlaw(1.0, -2.0)
@@ -105,11 +105,11 @@ def gauss_model(ra=359.6, dec=+0.1, sigma=0.2):
     Set Gaussian model.
     """
     # Set Gaussian centre
-    center = GSkyDir()
-    center.radec_deg(ra, dec)
+    centre = GSkyDir()
+    centre.radec_deg(ra, dec)
     # Set radial model
-    radial = GModelRadialGauss(center, sigma)
+    radial = GModelRadialGauss(centre, sigma)
     # Set spectral model
     spectral = GModelSpectralPlaw(1.0, -2.0)
@@ -53,11 +53,11 @@ def shell_model(ra=0.3, dec=0.3, radius=0.3, width=0.1):
     Set shell model.
     """
     # Set shell centre
-    center = GSkyDir()
-    center.radec_deg(ra, dec)
+    centre = GSkyDir()
+    centre.radec_deg(ra, dec)
     # Set radial model
-    radial = GModelSpatialRadialShell(center, radius, width, False)
+    radial = GModelSpatialRadialShell(centre, radius, width, False)
     # Set spectral model
     spectral = GModelSpectralPlaw(1.0, -2.0, GEnergy(100.0, "MeV"))
@@ -77,11 +77,11 @@ def disk_model(ra=359.6, dec=-0.2, radius=0.4):
     Set disk model.
     """
     # Set disk centre
-    center = GSkyDir()
-    center.radec_deg(ra, dec)
+    centre = GSkyDir()
+    centre.radec_deg(ra, dec)
     # Set radial model
-    radial = GModelSpatialRadialDisk(center, radius)
+    radial = GModelSpatialRadialDisk(centre, radius)
     # Set spectral model
     spectral = GModelSpectralPlaw(1.0, -2.0, GEnergy(100.0, "MeV"))
@@ -101,11 +101,11 @@ def gauss_model(ra=359.6, dec=+0.1, sigma=0.2):
     Set Gaussian model.
     """
     # Set Gaussian centre
-    center = GSkyDir()
-    center.radec_deg(ra, dec)
+    centre = GSkyDir()
+    centre.radec_deg(ra, dec)
     # Set radial model
-    radial = GModelSpatialRadialGauss(center, sigma)
+    radial = GModelSpatialRadialGauss(centre, sigma)
     # Set spectral model
     spectral = GModelSpectralPlaw(1.0, -2.0, GEnergy(100.0, "MeV"))
@@ -111,7 +111,7 @@ public:
     void right(const std::string& arg, const int& n) {
         (*self) << gammalib::right(arg, n);
     }
-    void center(const std::string& arg, const int& n) {
-        (*self) << gammalib::center(arg, n);
+    void centre(const std::string& arg, const int& n) {
+        (*self) << gammalib::centre(arg, n);
     }
 }
@@ -72,7 +72,7 @@ namespace gammalib {
     std::string              fill(const std::string& s, int n);
     std::string              left(const std::string& s, int n, char c = ' ');
     std::string              right(const std::string& s, int n, char c = ' ');
-    std::string              center(const std::string& s, int n, char c = ' ');
+    std::string              centre(const std::string& s, int n, char c = ' ');
     std::string              parformat(const std::string& s, const int& indent = 0);
     double                   plaw_photon_flux(const double& emin,
                                               const double& emax,
@@ -425,7 +425,7 @@ void GApplication::log_header(void)
     // Dump header
     log << gammalib::fill("*", header_width) << std::endl;
-    log << "*" << gammalib::center(m_name, header_width-2) << "*" << std::endl;
+    log << "*" << gammalib::centre(m_name, header_width-2) << "*" << std::endl;
     log << "* " << gammalib::fill("-", header_width-4) << " *" << std::endl;
     log << "* Version: " << gammalib::left(m_version, header_width-12) << "*" << std::endl;
     log << gammalib::fill("*", header_width) << std::endl;
@@ -471,7 +471,7 @@ bool GSkyRegionCircle::contains(const GSkyRegion&amp; reg) const
 		const GSkyRegionCircle* regcirc =
               dynamic_cast<const GSkyRegionCircle*>(&reg);
-		// Calculate angular distance between the centers
+		// Calculate angular distance between the centres
 		double ang_dist = m_centre.dist_deg(regcirc->centre());
 		// Check if the region is contained in this
@@ -512,7 +512,7 @@ bool GSkyRegionCircle::overlaps(const GSkyRegion&amp; reg) const
 		const GSkyRegionCircle* regcirc =
               dynamic_cast<const GSkyRegionCircle*>(&reg);
-		// Calculate angular distance between the centers
+		// Calculate angular distance between the centres
 		double ang_dist = m_centre.dist_deg(regcirc->centre());
 		// Check if the distance is smaller than the sum of both radii
@@ -660,16 +660,16 @@ std::string gammalib::right(const std::string&amp; s, const int&amp; n, const char&amp; c)
 /***********************************************************************//**
- * @brief Center string to achieve a length of n characters
+ * @brief Centre string to achieve a length of n characters
  *
  * @param[in] s String to be centred.
  * @param[in] n Requested total width.
  * @param[in] c Left fill character.
  *
- * Center string by adding whitespace to the left and the right to achieve a
+ * Centre string by adding whitespace to the left and the right to achieve a
  * length of n characters.
  ***************************************************************************/
-std::string gammalib::center(const std::string& s, const int& n, const char& c)
+std::string gammalib::centre(const std::string& s, const int& n, const char& c)
 {
     // Compute number of characters to fill left and right
     int n_right = (n-s.length()) / 2;
@@ -24,15 +24,15 @@ from gammalib import *
 # Set the location / centre of the source model to
 # Right Ascension = 42.0 deg and Declination = 43 deg
 # ===================================================
-center = GSkyDir()
-center.radec_deg(42.0, 43.0)
+centre = GSkyDir()
+centre.radec_deg(42.0, 43.0)
 #
 # Create a point source with power law spectral shape
 # Normalization:   1.0e-7 ph/cm2/s/MeV @ 100 MeV
 # Spectral index: -2.1
 # ===================================================
-point_spatial  = GModelSpatialPointSource(center)
+point_spatial  = GModelSpatialPointSource(centre)
 point_spectrum = GModelSpectralPlaw(1.0e-7, -2.1, GEnergy(100.0, "MeV"))
 point = GModelSky(point_spatial, point_spectrum)
 point.name('My point source')
@@ -43,7 +43,7 @@ point.name(&#39;My point source&#39;)
 # Normalization:   4.2e-7 ph/cm2/s/MeV @ 100 MeV
 # Spectral index: -2.4
 # ===================================================
-gauss_spatial  = GModelSpatialRadialGauss(center, 3.0)
+gauss_spatial  = GModelSpatialRadialGauss(centre, 3.0)
 gauss_spectrum = GModelSpectralPlaw(4.2e-7, -2.4, GEnergy(100.0, "MeV"))
 gauss = GModelSky(gauss_spatial, gauss_spectrum)
 gauss.name('My Gaussian source')
@@ -37,7 +37,7 @@ def test_radial_model(name, model, clobber=True):
     time   = GTime()
     for inx in range(image.npix()):
         dir        = image.inx2dir(inx)
-        theta      = center.dist(dir)
+        theta      = centre.dist(dir)
         image[inx] = model.eval(theta, energy, time)
     # Write it to file
@@ -62,10 +62,10 @@ if __name__ == &#39;__main__&#39;:
     Test radial model integration.
     """
     # Set model location / centre
-    center = GSkyDir()
-    center.radec_deg(0.3, 0.1)
+    centre = GSkyDir()
+    centre.radec_deg(0.3, 0.1)
     # Test models
-    test_radial_model(name='gauss', model=GModelSpatialRadialGauss(center, 0.3))
-    test_radial_model(name='disk',  model=GModelSpatialRadialDisk(center, 0.8))
-    test_radial_model(name='shell', model=GModelSpatialRadialShell(center, 0.5, 0.1))
+    test_radial_model(name='gauss', model=GModelSpatialRadialGauss(centre, 0.3))
+    test_radial_model(name='disk',  model=GModelSpatialRadialDisk(centre, 0.8))
+    test_radial_model(name='shell', model=GModelSpatialRadialShell(centre, 0.5, 0.1))
@@ -89,7 +89,7 @@ class Test(GPythonTestSuite):
         log("\n")
         log.right("Right", 10)
         log("\n")
-        log.center("Center", 10)
+        log.centre("Centre", 10)
         log("\n")
         log.header0("Header 0")
         log("\n")
@@ -112,7 +112,7 @@ class Test(GPythonTestSuite):
         ref.append("HiggsHiggsHiggs\n")
         ref.append("Left      \n")
         ref.append("     Right\n")
-        ref.append("  Center  \n")
+        ref.append("  Centre  \n")
         ref.append("\n")
         ref.append("+==========+\n")
         ref.append("| Header 1 |\n")
@@ -134,7 +134,7 @@ class Test(GPythonTestSuite):
         calls.append("fill()")
         calls.append("left()")
         calls.append("right()")
-        calls.append("center()")
+        calls.append("centre()")
         calls.append("header0()")
         calls.append("header1()")
         calls.append("header1()")
@@ -930,7 +930,7 @@ void TestGSky::test_GSkyRegionCircle_logic(void)
     // Test contain dirs
 	test_assert(refregion.contains(refdir_radeczerozero),"test for containment");
-    test_assert(refregion.contains(centre), "test if center in circle");
+    test_assert(refregion.contains(centre), "test if centre in circle");
 	test_assert(!refregion.contains(refdir_outside_refregion), "test2 for containment");
 	// Test contain regions