Index: /trunk/tools/heathers_plots/deploy.sh
===================================================================
--- /trunk/tools/heathers_plots/deploy.sh	(revision 35390)
+++ /trunk/tools/heathers_plots/deploy.sh	(revision 35390)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -f heathers_plots.py $HOME/local/bin
+
Index: /trunk/tools/heathers_plots/heathers_plots.py
===================================================================
--- /trunk/tools/heathers_plots/heathers_plots.py	(revision 35389)
+++ /trunk/tools/heathers_plots/heathers_plots.py	(revision 35390)
@@ -1,3 +1,3 @@
-#!/usr/bin env python
+#!/usr/local/bin/python2.7
 
 """
@@ -10,4 +10,5 @@
 import numpy as np
 import matplotlib as mpl
+mpl.use('Agg')
 import matplotlib.pyplot as plt
 import pylab
@@ -24,5 +25,7 @@
     IMAGES_DIRECTORY = "/data/ipp009.0/czartool_plots/heathers_plots"
     CAM_WEB_FILENAME = "/data/ipp009.0/czartool_plots/heathers_plots/cam.png"
+    CAM_MERGED_WEB_FILENAME = "/data/ipp009.0/czartool_plots/heathers_plots/cam_merged.png"
     SKYCAL_WEB_FILENAME = "/data/ipp009.0/czartool_plots/heathers_plots/skycal.png"
+    SKYCAL_MERGED_WEB_FILENAME = "/data/ipp009.0/czartool_plots/heathers_plots/skycal_merged.png"
 
     def __init__(self):
@@ -37,4 +40,17 @@
 WHERE stage = 'cam' and addRun.dvodb = 'LAP.20120706'
 """
+
+    CAM_MERGED_STATEMENT = """SELECT ra, decl, mergedvodbRun.state, mergedvodbProcessed.fault 
+FROM mergedvodbRun 
+ LEFT JOIN mergedvodbProcessed USING(merge_id)
+ LEFT JOIN minidvodbRun USING(minidvodb_id)
+ LEFT JOIN addRun USING(minidvodb_name)
+ LEFT JOIN addProcessedExp USING(add_id)
+ JOIN camRun ON stage_id = cam_id
+ JOIN chipRun USING(chip_id)
+ JOIN rawExp USING(exp_id)
+WHERE stage = 'cam' AND mergedvodbRun.mergedvodb = 'LAP.20120706'
+"""
+
     SKYCAL_STATEMENT = """SELECT radeg*3.1415927/180., decdeg*3.1415927/180., addRun.state, addProcessedExp.fault 
 FROM addRun
@@ -48,4 +64,18 @@
 WHERE stage = 'skycal' AND addRun.dvodb = 'LAP.20120706' 
 """
+
+    SKYCAL_MERGED_STATEMENT = """SELECT radeg*3.1415927/180., decdeg*3.1415927/180., mergedvodbRun.state, mergedvodbProcessed.fault
+FROM mergedvodbRun
+ LEFT JOIN mergedvodbProcessed USING(merge_id)
+ LEFT JOIN minidvodbRun USING(minidvodb_id)
+ LEFT JOIN addRun USING(minidvodb_name)
+ LEFT JOIN addProcessedExp USING(add_id)
+ JOIN skycalRun ON skycal_id = stage_id
+ JOIN skycalResult USING(skycal_id)
+ JOIN staticskyInput USING(sky_id, stack_id)
+ JOIN staticskyRun USING (sky_id)
+ JOIN stackRun using (stack_id)
+ JOIN skycell using (tess_id, skycell_id)
+WHERE stage = 'skycal' AND addRun.dvodb = 'LAP.20120706'"""
 
     def fetch_data(self, statement):
@@ -95,6 +125,6 @@
         try:
             os.unlink(web_filename)
-        except OSError: # No such file or directory
-            pass
+        except OSError, e: # No such file or directory
+            print e
         os.symlink(new_filename, web_filename)
 
@@ -115,4 +145,10 @@
         self.relink_webfiles(HeathersPlot.CAM_WEB_FILENAME, new_filename)
 
+    def update_cam_merged_plot(self):
+        HeathersPlot.mkdir(HeathersPlot.IMAGES_DIRECTORY)
+        (ras, decs, states) = self.fetch_data(HeathersPlot.CAM_MERGED_STATEMENT)
+        new_filename = self.plot(ras, decs, states, 'Camera_Merged')
+        self.relink_webfiles(HeathersPlot.CAM_MERGED_WEB_FILENAME, new_filename)
+
     def update_skycal_plot(self):
         HeathersPlot.mkdir(HeathersPlot.IMAGES_DIRECTORY)
@@ -121,6 +157,14 @@
         self.relink_webfiles(HeathersPlot.SKYCAL_WEB_FILENAME, new_filename)
 
+    def update_skycal_merged_plot(self):
+        HeathersPlot.mkdir(HeathersPlot.IMAGES_DIRECTORY)
+        (ras, decs, states) = self.fetch_data(HeathersPlot.SKYCAL_MERGED_STATEMENT)
+        new_filename = self.plot(ras, decs, states, 'SkyCal_Merged')
+        self.relink_webfiles(HeathersPlot.SKYCAL_MERGED_WEB_FILENAME, new_filename)
+
 if __name__ == "__main__":
     hp = HeathersPlot()
     hp.update_cam_plot()
     hp.update_skycal_plot()
+    hp.update_cam_merged_plot()
+    hp.update_skycal_merged_plot()