Index: /trunk/MagicSoft/Mars/mreport/MReportTrigger.cc
===================================================================
--- /trunk/MagicSoft/Mars/mreport/MReportTrigger.cc	(revision 4970)
+++ /trunk/MagicSoft/Mars/mreport/MReportTrigger.cc	(revision 4971)
@@ -34,5 +34,6 @@
 //  *Input:
 //
-//  The report is divided into 8 sections: 
+//  The report is divided into 9 sections: 
+//  - the name of the Table                 (1 field)
 //  - the cell rates                       (32 fields)
 //  - L1 and L2 table name                 ( 2 fields)
@@ -164,5 +165,4 @@
        }
     TString descriptor = str(0, ws);
-    //*fLog  << descriptor <<endl;
     str.Remove(0, ws);
       
@@ -174,15 +174,17 @@
 	}
       str.Remove(0, len); // Remove Prescal. factors from report string
-      // *fLog << warn << fPrescFactor->fPrescFact[i]<<endl;
-    }
-  str=str.Strip(TString::kLeading);  
-  
-  return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Interprete the Scaler with Live-Deadtime section of the report
+    }
+  str=str.Strip(TString::kLeading);  
+  
+  return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Interprete the Scalers with Live-Deadtime section of the report
 //  Read 4x5 integers separated with a blank
+//  There are 5 scalers,each one with the live and deadtime.
+//  Live and deadtimes have two fields, with the most significant
+//  and less significant bits.
 //
 Bool_t MReportTrigger::InterpreteLiveTime(TString &str)
@@ -255,5 +257,5 @@
        }
     
-    TString L1tablename = str(0, wsL1);
+    fL1Tablename = str(0, wsL1);
     str.Remove(0, wsL1);
 
@@ -277,5 +279,5 @@
         return kCONTINUE;
       }    
-    TString L2tablename = str(0, wsL2);
+    fL2Tablename = str(0, wsL2);
     str.Remove(0,wsL2);
     str.Strip(TString::kBoth);
@@ -389,5 +391,5 @@
     }
 
-    TString tablename = str(0, ws);
+    fTablename = str(0, ws);
     str.Remove(0, ws);
 
@@ -439,11 +441,4 @@
     if (!InterpreteIPR(str))
       return kCONTINUE;
-
- 
-
-  //    str.Remove(0,len);
-  //  str.Strip(TString::kBoth);
-
-  //*fLog << warn << " str=" << str << endl;
 
     return str==(TString)"OVER" ? kTRUE : kCONTINUE;
Index: /trunk/MagicSoft/Mars/mreport/MReportTrigger.h
===================================================================
--- /trunk/MagicSoft/Mars/mreport/MReportTrigger.h	(revision 4970)
+++ /trunk/MagicSoft/Mars/mreport/MReportTrigger.h	(revision 4971)
@@ -22,4 +22,7 @@
   Float_t fL2BeforePrescaler;       // L2 trigger rate before prescaler
   Float_t fL2AfterPrescaler;        // L2 trigger rate after prescaler
+  TString fTablename;               // Name of the trigger table
+  TString fL1Tablename;             // Name of the L1 trigger table
+  TString fL2Tablename;             // Name of the L2 trigger table
   
   MTriggerBit *fBit;                //! container of the L2 prescaler rates
Index: /trunk/MagicSoft/Mars/mtrigger/MTriggerBit.h
===================================================================
--- /trunk/MagicSoft/Mars/mtrigger/MTriggerBit.h	(revision 4970)
+++ /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 4970)
+++ /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 4970)
+++ /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 4970)
+++ /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
 };