Merge branch 'master' of git.km3net.de:km3py/km3mon

Makefile.in

@@ -101,7 +101,7 @@ start:
 	@tmux new-window -n k40 -t ${SESSION_NAME}
 	@tmux split-window -v -t ${SESSION_NAME}:k40
 	@tmux send-keys -t ${SESSION_NAME}:k40.1  \
-	    "python scripts/k40_calibration.py -d ${DETECTOR_ID} -p ${MONITORING_LIGIER_PORT}" Enter
+	    "# python scripts/k40_calibration.py -d ${DETECTOR_ID} -p ${MONITORING_LIGIER_PORT}" Enter
 	@tmux select-layout even-vertical
 
 	@# Logs

app/templates/base.html

@@ -44,9 +44,9 @@
           <ul class="nav navbar-nav">
             <li class="active"><a href="rttc.html">RTTC</a></li>
           </ul>
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="k40.html">K40</a></li>
-          </ul>
+          <!-- <ul class="nav navbar&#45;nav"> -->
+          <!--   <li class="active"><a href="k40.html">K40</a></li> -->
+          <!-- </ul> -->
           <ul class="nav navbar-nav">
             <li class="active"><a href="reco.html">Reco</a></li>
           </ul>

scripts/ztplot.py

@@ -32,6 +32,7 @@ import matplotlib.ticker as ticker
 import numpy as np
 
 import km3pipe as kp
+from km3pipe.io.daq import is_3dmuon, is_3dshower, is_mxshower
 from km3modules.hits import count_multiplicities
 import km3pipe.style
 km3pipe.style.use('km3pipe')
@@ -190,14 +191,22 @@ class ZTPlot(kp.Module):
             loc='upper left',
             bbox_to_anchor=(1.005, 1))
 
+        trigger_params = ' '.join([
+            trig
+            for trig, trig_check in (("MX", is_mxshower), ("3DM", is_3dmuon),
+                                     ("3DS", is_3dshower))
+            if trig_check(int(event_info.trigger_mask[0]))
+        ])
+
         plt.suptitle(
             "z-t-Plot for DetID-{0} (t0set: {1}), Run {2}, FrameIndex {3}, "
-            "TriggerCounter {4}, Overlays {5}, time offset {6} ns"
-            "\n{7} UTC".format(
+            "TriggerCounter {4}, Overlays {5}, Trigger: {8}"
+            "\n{7} UTC (time offset: {6} ns)".format(
                 event_info.det_id[0], self.t0set, event_info.run_id[0],
                 event_info.frame_index[0], event_info.trigger_counter[0],
                 event_info.overlays[0], time_offset,
-                datetime.utcfromtimestamp(event_info.utc_seconds)),
+                datetime.utcfromtimestamp(
+                    event_info.utc_seconds), trigger_params),
             fontsize=fontsize,
             y=1.05)