Index: trunk/MagicSoft/Mars/mtrigger/MTriggerBit.h
===================================================================
--- trunk/MagicSoft/Mars/mtrigger/MTriggerBit.h	(revision 4966)
+++ trunk/MagicSoft/Mars/mtrigger/MTriggerBit.h	(revision 4971)
@@ -2,7 +2,4 @@
 #define MARS_MTriggerBit
 
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
@@ -13,9 +10,10 @@
 #endif
 
-class MTriggerBit : public MParContainer, public MCamEvent
+class MTriggerBit : public MParContainer
 {
     friend class MReportTrigger;
 
 private:
+    
     static const Int_t gsNBits=20;        // number of output bits
 
@@ -26,16 +24,8 @@
     {
         fName  = "MTriggerBit";
-        fTitle = "Trigger-Container for the L2 output bits rates";
+        fTitle = "Container for the L2 output bits rates ";
     }
 
-    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
-    {
-      if (idx > gsNBits)
-	return kFALSE;
-
-      val = fBit[idx];	
-
-      return val>0;
-    }
+    TArrayF GetTriggerBit() const { return fBit; }
 
     Double_t operator[](const Int_t idx) 
@@ -47,9 +37,5 @@
       }
 
-    void DrawPixelContent(Int_t num) const
-    {
-    }
-
-    ClassDef(MTriggerBit, 1) // Trigger-Container for the L2 output bits rates
+    ClassDef(MTriggerBit, 1) // Container for the L2 output bits rates
 };
 
Index: trunk/MagicSoft/Mars/mtrigger/MTriggerCell.h
===================================================================
--- trunk/MagicSoft/Mars/mtrigger/MTriggerCell.h	(revision 4966)
+++ trunk/MagicSoft/Mars/mtrigger/MTriggerCell.h	(revision 4971)
@@ -2,7 +2,4 @@
 #define MARS_MTriggerCell
 
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
@@ -13,12 +10,12 @@
 #endif
 
-class MTriggerCell : public MParContainer, public MCamEvent
+class MTriggerCell : public MParContainer
 {
     friend class MReportTrigger;
+private:
+    static const Int_t gsNCells=32; //Number of fields with cell rates
+                                    // 19 cells and 12 dummy 
 
-private:
-    static const Int_t gsNCells=32; //Number of fields with cell rates 19 cells and 12 dummy
-
-    TArrayF fCellRate;              // Array of the measured L1 cell rates
+    TArrayF fCellRate;       // Array of the measured L1 cell rates
 
 public:
@@ -26,17 +23,10 @@
     {
         fName  = "MTriggerCell";
-        fTitle = "Trigger-Container for the measured cell rates";
+        fTitle = "Container for the measured cell rates";
     }
 
     Float_t GetMean() const { return fCellRate.GetSum()/fCellRate.GetSize(); }
 
-    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
-    {
-      if (idx > gsNCells)
-	return kFALSE;
-      
-      val = fCellRate[idx];
-        return val>0;
-    }
+    TArrayF GetCellRate() const { return fCellRate; }
 
     Double_t operator[](const Int_t idx) 
@@ -48,9 +38,6 @@
       }
 
-    void DrawPixelContent(Int_t num) const
-    {
-    }
 
-    ClassDef(MTriggerCell, 1) // Trigger-Container for the measured cell rates
+    ClassDef(MTriggerCell, 1) // Container for the trigger cell rates
 };
 
Index: trunk/MagicSoft/Mars/mtrigger/MTriggerLiveTime.h
===================================================================
--- trunk/MagicSoft/Mars/mtrigger/MTriggerLiveTime.h	(revision 4966)
+++ trunk/MagicSoft/Mars/mtrigger/MTriggerLiveTime.h	(revision 4971)
@@ -2,7 +2,4 @@
 #define MARS_MTriggerLiveTime
 
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
@@ -13,5 +10,5 @@
 #endif
 
-class MTriggerLiveTime : public MParContainer, public MCamEvent
+class MTriggerLiveTime : public MParContainer
 {
     friend class MReportTrigger;
@@ -27,17 +24,11 @@
     {
         fName  = "MTriggerLiveTime";
-        fTitle = "Trigger-Container for the Live-deadtime";
+        fTitle = "Container for the Live-deadtime      ";
     }
 
-    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
-    {
-      if (idx > gsNScalers)
-	return kFALSE;
+    TArrayL GetLiveTime() const { return fLiveTime; }
+    TArrayL GetDeadTime() const { return fDeadTime; }
 
-      val = fLiveTime[idx];	
-
-      return val>0;
-    }
-
+    // !FIX ME!  Only live time is returned...
     Double_t operator[](const Int_t idx) 
       {  	
@@ -48,9 +39,5 @@
       }
 
-    void DrawPixelContent(Int_t num) const
-    {
-    }
-
-    ClassDef(MTriggerLiveTime, 1) // Trigger-Container for the Live-Deadtime
+    ClassDef(MTriggerLiveTime, 1) // Container for the Live-Deadtime
 };
 
Index: trunk/MagicSoft/Mars/mtrigger/MTriggerPrescFact.h
===================================================================
--- trunk/MagicSoft/Mars/mtrigger/MTriggerPrescFact.h	(revision 4966)
+++ trunk/MagicSoft/Mars/mtrigger/MTriggerPrescFact.h	(revision 4971)
@@ -2,7 +2,4 @@
 #define MARS_MTriggerPrescFact
 
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
@@ -13,5 +10,5 @@
 #endif
 
-class MTriggerPrescFact : public MParContainer, public MCamEvent
+class MTriggerPrescFact : public MParContainer
 {
     friend class MReportTrigger;
@@ -27,16 +24,8 @@
     {
         fName  = "MTriggerPrescFact";
-        fTitle = "Trigger-Container for the L2 Prescaling Factors";
+        fTitle = "Container for the L2 Prescaling Factors      ";
     }
 
-    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
-    {
-      if (idx > gsNPrescFacts)
-	return kFALSE;
-
-      val = fPrescFact[idx];	
-
-      return val>0;
-    }
+    TArrayL GetPrescFactors() const { return fPrescFact; }
 
     Double_t operator[](const Int_t idx) 
@@ -48,9 +37,5 @@
       }
 
-    void DrawPixelContent(Int_t num) const
-    {
-    }
-
-    ClassDef(MTriggerPrescFact, 1) // Trigger-Container for the L2 Prescaling Factors
+    ClassDef(MTriggerPrescFact, 1) // Container for the L2 Prescaling Factors
 };