Merge pull request #122 from fact-project/fix_planar_collision

Fix planar name collision with ctapipe, fixes #121
fact-project · Apr 23, 2019 · 8a5eadd · 8a5eadd
2 parents 413afaf + fde7bb4
commit 8a5eadd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ before_install:
   - pip install --upgrade pip
 
 install:
-  - pip install restructuredtext-lint sphinx pygments
+  - pip install restructuredtext-lint sphinx~=1.8 pygments
   - pip install .
 
 script:

diff --git a/fact/VERSION b/fact/VERSION
@@ -1 +1 @@
-0.22.1
+0.22.2
diff --git a/fact/analysis/statistics.py b/fact/analysis/statistics.py
@@ -58,7 +58,7 @@ def power_law(
     Simple power law
 
     .. math::
-        \phi = \phi_0 \cdot (E / E_{}\mathrm{ref}})^{\gamma}
+        \phi = \phi_0 \cdot (E / E_{\mathrm{ref}})^{\gamma}
 
     Parameters
     ----------

diff --git a/fact/coordinates/camera_frame.py b/fact/coordinates/camera_frame.py
@@ -16,7 +16,7 @@
 from astropy.coordinates.representation import CartesianRepresentation
 import astropy.units as u
 
-from .representation import PlanarRepresentation
+from .representation import FACTPlanarRepresentation
 from ..instrument.constants import FOCAL_LENGTH_MM, LOCATION
 import numpy as np
 
@@ -44,7 +44,7 @@ class CameraFrame(BaseCoordinateFrame):
         False means x points up and y points left,
         which is definition in the original FACTPixelMap file.
     '''
-    default_representation = PlanarRepresentation
+    default_representation = FACTPlanarRepresentation
     pointing_direction = CoordinateAttribute(frame=AltAz, default=None)
     obstime = TimeAttribute(default=None)
     location = EarthLocationAttribute(default=LOCATION)

diff --git a/fact/coordinates/representation.py b/fact/coordinates/representation.py
@@ -4,7 +4,7 @@
 import numpy as np
 
 
-class PlanarRepresentation(BaseRepresentation):
+class FACTPlanarRepresentation(BaseRepresentation):
     '''
     Representation of a point in a 2D plane. This is needed for coordinate
     frames to store their coordinates internally.