From c16601c870bfd66f0968b21d374bb8593bf7498b Mon Sep 17 00:00:00 2001
From: James Kerns <jkerns100@gmail.com>
Date: Sat, 13 Feb 2016 23:41:59 -0600
Subject: [PATCH] middle of something

---
 pylinac/core/image.py  |  5 +++++
 pylinac/picketfence.py | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pylinac/core/image.py b/pylinac/core/image.py
index 1088f90c..a668aa80 100644
--- a/pylinac/core/image.py
+++ b/pylinac/core/image.py
@@ -183,6 +183,11 @@ def center(self):
         y_center = self.shape[0] / 2
         return Point(x_center, y_center)
 
+    @property
+    def physical_shape(self):
+        """The physical size of the image in mm."""
+        return (self.shape[0] / self.dpmm, self.shape[1] / self.dpmm)
+
     def plot(self, ax=None, show=True, clear_fig=False):
         """Plot the image."""
         if ax is None:
diff --git a/pylinac/picketfence.py b/pylinac/picketfence.py
index 1352d259..31accf74 100644
--- a/pylinac/picketfence.py
+++ b/pylinac/picketfence.py
@@ -74,6 +74,8 @@ def __init__(self, filename, filter=None, log=None):
             self.image.check_inversion()
         if log is not None:
             self.load_log(log)
+        else:
+            self._log_fits = None
 
     @classmethod
     def from_url(cls, url, filter=None):
@@ -171,15 +173,15 @@ def _adjust_for_sag(self, sag):
     def load_log(self, log):
         """Load a machine log that corresponds to the picket fence delivery."""
         mlog = MachineLog(log)
-        fl = mlog.fluence.actual.calc_map(equal_aspect=True)
-        fli = Image.load(fl, dpi=254)
+        fl = mlog.fluence.expected.calc_map(equal_aspect=True)
+        fli = Image.load(fl, dpi=254)  # 254 pix/in => 1 pix/0.1mm (default fluence calc)
         # crop fluence array to same physical size as EPID
-        # self.image.physical_shape
         hdiff = fli.physical_shape[0] - self.image.physical_shape[0]
         wdiff = fli.physical_shape[1] - self.image.physical_shape[1]
         fli.remove_edges(int(min(hdiff, wdiff) * fli.dpmm / 2 + 2))
         new_array = Image.load(fli.array, dpi=254)
-        pf = PicketFence(new_array)
+        pf = PicketFence.from_demo_image()
+        pf.image = new_array
         pf.analyze()
         self._log_fits = cycle([p.fit for p in pf.pickets])
         # resize image
@@ -437,7 +439,7 @@ def __init__(self, orientation, tolerance, action_tolerance, hdmlc, image, log_f
         self.image = image
         self.dpmm = image.dpmm
         self.mmpd = 1/image.dpmm
-        self.image_center = image.cax
+        self.image_center = image.center
         self.log_fits = log_fits
 
     @property
@@ -489,10 +491,10 @@ def leaf_centers(self):
 
         # now adjust them to align with the iso
         if self.orientation == UP_DOWN:
-            leaf30_center = self.image.cax.y - self.small_leaf_width / 2
+            leaf30_center = self.image_center.y - self.small_leaf_width / 2
             edge = self.image.shape[0]
         else:
-            leaf30_center = self.image.cax.x - self.small_leaf_width / 2
+            leaf30_center = self.image_center.x - self.small_leaf_width / 2
             edge = self.image.shape[1]
         adjustment = leaf30_center - leaf_centers[29]
         leaf_centers += adjustment