Index: /trunk/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- /trunk/Mars/manalysis/AnalysisLinkDef.h	(revision 18480)
+++ /trunk/Mars/manalysis/AnalysisLinkDef.h	(revision 18481)
@@ -26,4 +26,5 @@
 
 #pragma link C++ class MSoftwareTrigger+;
+#pragma link C++ class MSoftwareTriggerCalc+;
 
 #endif
Index: /trunk/Mars/manalysis/MSoftwareTrigger.cc
===================================================================
--- /trunk/Mars/manalysis/MSoftwareTrigger.cc	(revision 18481)
+++ /trunk/Mars/manalysis/MSoftwareTrigger.cc	(revision 18481)
@@ -0,0 +1,51 @@
+/* ======================================================================== *\
+!
+! *
+! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+! * Software. It is distributed to you in the hope that it can be a useful
+! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+! * It is distributed WITHOUT ANY WARRANTY.
+! *
+! * Permission to use, copy, modify and distribute this software and its
+! * documentation for any purpose is hereby granted without fee,
+! * provided that the above copyright notice appear in all copies and
+! * that both that copyright notice and this permission notice appear
+! * in supporting documentation. It is provided "as is" without express
+! * or implied warranty.
+! *
+!
+!
+!   Author(s): Thomas Bretz, 04/2016 <mailto:tbretz@physik.rwth-aachen.de>
+!
+!   Copyright: FACT Software Development, 2000-2016
+!
+!
+\* ======================================================================== */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// MSoftwareTrigger
+//
+/////////////////////////////////////////////////////////////////////////////
+#include "MSoftwareTrigger.h"
+
+#include <TMath.h>
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+ClassImp(MSoftwareTrigger);
+
+using namespace std;
+
+// --------------------------------------------------------------------------
+//
+// Default constructor.
+//
+MSoftwareTrigger::MSoftwareTrigger(const char *name, const char *title) : fPatch(-1),
+    fBaseline(0), fPosition(0), fAmplitude(0)
+
+{
+    fName  = name  ? name  : "MSoftwareTrigger";
+    fTitle = title ? title : "Storage container for the software trigger";
+}
Index: /trunk/Mars/manalysis/MSoftwareTrigger.h
===================================================================
--- /trunk/Mars/manalysis/MSoftwareTrigger.h	(revision 18481)
+++ /trunk/Mars/manalysis/MSoftwareTrigger.h	(revision 18481)
@@ -0,0 +1,31 @@
+#ifndef MARS_MSoftwareTrigger
+#define MARS_MSoftwareTrigger
+
+#ifndef MARS_MParContainer
+#include "MParContainer.h"
+#endif
+
+class MSoftwareTrigger : public MParContainer
+{
+private:
+     Short_t fPatch;
+    Double_t fBaseline;
+    UShort_t fPosition;
+    Double_t fAmplitude;
+
+public:
+    MSoftwareTrigger(const char *name=NULL, const char *title=NULL);
+
+    void SetData(Short_t i, Double_t bl, UShort_t pos, Double_t ampl)
+    {
+        fPatch = i;
+        fBaseline = bl;
+        fAmplitude = ampl;
+        fPosition = pos;
+    }
+
+    ClassDef(MSoftwareTrigger, 1) // Storage Container for software trigger
+};
+
+#endif
+
Index: /trunk/Mars/manalysis/Makefile
===================================================================
--- /trunk/Mars/manalysis/Makefile	(revision 18480)
+++ /trunk/Mars/manalysis/Makefile	(revision 18481)
@@ -35,5 +35,6 @@
            MEventRateCalc.cc \
            MMcCalibrationUpdate.cc \
-	   MSoftwareTrigger.cc
+	   MSoftwareTrigger.cc \
+	   MSoftwareTriggerCalc.cc
 
 #           MMcTriggerLvl2.cc \