Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1788)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1789)
@@ -6,7 +6,18 @@
       - Fixed mistake when analysing camera files containing all events 
         (including non-triggers): fShowers was always zero.
+      - Added reading of MMcTrigHeaders in ReInit
 
     * macros/trigrate.C
       - Added some explanations. Style improvements in function GetNSBEvents.
+
+    * mhist/MHMcRate.[h,cc]
+      - Added GetTriggerRate() and GetTriggerRateError()
+      - Added members fMultiplicity and fMeanThreshold, with their
+        corresponding Set and Get functions
+      - Added info on discriminator threshold and L1 trigger multiplicity
+	on the printout.
+
+    * mmc/MMcTrigHeader.hxx
+      - Added GetMultiplicity() and GetMeanThreshold()
 
  2003/02/22: Wolfgang Wittek
Index: /trunk/MagicSoft/Mars/mhist/MHMcRate.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHMcRate.cc	(revision 1788)
+++ /trunk/MagicSoft/Mars/mhist/MHMcRate.cc	(revision 1789)
@@ -61,4 +61,8 @@
     fTriggerRate= -1.0;      // Trigger rate in Hz
     fTriggerRateError= -1.0; // Estimated error for the trigger rate in Hz
+
+    fMultiplicity = -1;
+    fMeanThreshold = -1.;
+
 }
 
@@ -233,4 +237,5 @@
 {
     *fLog << all << "Incident rate " << fShowerRate << " Hz " << endl;
+    *fLog << "Multiplicity: " << fMultiplicity << ",  Discr. threshold: " << fMeanThreshold << endl;
     *fLog << "Trigger Rate " << fTriggerRate << " +- " << fTriggerRateError << " Hz" << endl;
 }
Index: /trunk/MagicSoft/Mars/mhist/MHMcRate.h
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHMcRate.h	(revision 1788)
+++ /trunk/MagicSoft/Mars/mhist/MHMcRate.h	(revision 1789)
@@ -38,4 +38,10 @@
     Float_t fTriggerRateError;  // Estimated error for the trigger rate in Hz
 
+    Float_t fMeanThreshold;     // Mean discriminator threshold (mV) of trigger
+                                // pixels.
+
+    Short_t fMultiplicity;      // L1 trigger multiplicity.
+
+
     void Init(const char *name, const char *title);
 
@@ -65,5 +71,14 @@
     void SetEnergyMin(Float_t Energy) {fEnergyMin=Energy;}
 
+    void SetMultiplicity(Short_t nMul) {fMultiplicity = nMul;}
+    void SetMeanThreshold(Float_t thresh) {fMeanThreshold = thresh;}
+
     void UpdateBoundaries(Float_t energy, Float_t theta, Float_t phi, Float_t impact);
+
+    Float_t GetTriggerRate() {return fTriggerRate;}
+    Float_t GetTriggerRateError() {return fTriggerRateError;}
+
+    Short_t GetMultiplicity() {return fMultiplicity;}
+    Float_t  GetMeanThreshold() {return fMeanThreshold;}
 
     void CalcRate(Float_t trig, Float_t anal, Float_t simu);
@@ -78,2 +93,5 @@
 
 #endif 
+
+
+
Index: /trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc	(revision 1788)
+++ /trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc	(revision 1789)
@@ -39,4 +39,5 @@
 #include "MMcTrig.hxx"
 #include "MMcRunHeader.hxx"
+#include "MMcTrigHeader.hxx"
 #include "MMcCorsikaRunHeader.h"
 
@@ -122,4 +123,5 @@
       "(5 degrees) for the original showers" << endl;
 
+
     for (UInt_t i=0; i<fNum; i++)
       {
@@ -136,4 +138,11 @@
 	GetRate(i)->SetEnergyMin(fMcCorRunHeader->GetELowLim()/1000.);
 	GetRate(i)->SetEnergyMax(fMcCorRunHeader->GetEUppLim()/1000.);
+
+	TString th("MMcTrigHeader;");
+	th += i+1;
+
+	MMcTrigHeader* trighead = (MMcTrigHeader*) pList->FindObject(th);
+	GetRate(i)->SetMeanThreshold(trighead->GetMeanThreshold());
+	GetRate(i)->SetMultiplicity(trighead->GetMultiplicity());
 
       }
Index: /trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx
===================================================================
--- /trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx	(revision 1788)
+++ /trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx	(revision 1789)
@@ -90,4 +90,25 @@
   }
 
+
+
+  Short_t GetMultiplicity() { return fMultiplicity; }
+
+  Float_t GetMeanThreshold()
+  {
+    int i;
+    Float_t sum = 0., trigpix = 0.;
+    for(i=0;i<CAMERA_PIXELS;i++)
+    {
+      if (fThreshold[i] < 1.e6)
+      {
+        sum += fThreshold[i];
+        trigpix += 1.;
+      }
+    }
+
+    return (sum / trigpix);
+  }
+
+
   ClassDef(MMcTrigHeader, 2)  //Stores Montecarlo Information which describes the used trigger