Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 707)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 708)
@@ -2,5 +2,5 @@
 
  2000/03/21: Thomas Bretz
-                                                                  
+                            
    * manalysis/MHillas.[h,cc]:
      - fixed some minor errors, added sanity check (N<2) to Calc
@@ -16,5 +16,8 @@
      - changed to use MPedestalCam
      
-   * manalysis/Makefile:
+   * manalysis/MCT1Pedestals.[h,cc]:
+     - removed
+     
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
      - removed MCT1Pedestals
      
Index: /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 707)
+++ /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 708)
@@ -12,5 +12,4 @@
 
 #pragma link C++ class MCT1ReadAscii;
-#pragma link C++ class MCT1Pedestals;
 
 #pragma link C++ class MPedestalPix;
Index: unk/MagicSoft/Mars/manalysis/MCT1Pedestals.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCT1Pedestals.cc	(revision 707)
+++ 	(revision )
@@ -1,53 +1,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MCT1Pedestals                                                           //
-//                                                                         //
-/////////////////////////////////////////////////////////////////////////////
-#include "MCT1Pedestals.h"
-
-#include <fstream.h>
-
-#include "MLog.h"
-
-ClassImp(MCT1Pedestals)
-
-MCT1Pedestals::MCT1Pedestals(const char *name, const char *title)
-{
-    *fName  = name  ? name  : "MCT1Pedestals";
-    *fTitle = title ? title : "Storage container for CT1 Pedestals";
-
-    //
-    // set the pedestals to default values
-    //
-    for (Int_t i = 0; i<127; i++ )
-        fPedest[i] = 1.5;
-}
-
-void MCT1Pedestals::AsciiRead (ifstream &fin)
-{
-    *fLog << "MCT1Pedestals::AsciiRead: Reading Pedestals..." << endl;
-
-    Int_t   dummyI;
-    Float_t dummyF;
-
-    //
-    // skip the next 4 values
-    //
-    fin >> dummyF; 
-    fin >> dummyF; 
-    fin >> dummyF; 
-    fin >> dummyF; 
-
-    //
-    //    read in the next 127 numbers as the pedestals
-    //
-    for (Int_t i = 0; i<127; i++)
-    {
-        fin >> dummyF;
-
-        if (dummyF > 0.0)
-            fPedest[i] = dummyF;
-    }
-
-    fin >> dummyI;
-}
Index: unk/MagicSoft/Mars/manalysis/MCT1Pedestals.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCT1Pedestals.h	(revision 707)
+++ 	(revision )
@@ -1,24 +1,0 @@
-#ifndef MCT1PEDESTALS_H
-#define MCT1PEDESTALS_H
-
-#ifndef MPARCONTAINER_H
-#include "MParContainer.h"
-#endif
-
-class MCT1Pedestals : public MParContainer
-{
-private:
-    Float_t fPedest[127]; //!
-
-public:
-    MCT1Pedestals(const char *name=NULL, const char *title=NULL);
-
-    Float_t &operator[](int i) { return fPedest[i]; }
-
-    void AsciiRead (ifstream &fin);
-
-    ClassDef(MCT1Pedestals, 1)	// Storage Container for CT1 Pedestals
-};
-
-#endif
-
Index: /trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.cc	(revision 707)
+++ /trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.cc	(revision 708)
@@ -45,14 +45,17 @@
 Bool_t MCollAreaTrigger::Process () 
 { 
+    const Float_t energy = log10(fMcEvt->GetEnergy());
+    const Float_t impact = fMcEvt->GetImpact()/100.;
 
-  fCollArea->FillAll( log10( fMcEvt->GetEnergy()) , 
-			     fMcEvt->GetImpact()/100. ) ; 
-  
-  if ( fMcTrig->GetFirstLevel() > 0 ) 
-    fCollArea->FillSel( log10( fMcEvt->GetEnergy()) , 
-			fMcEvt->GetImpact()/100. ) ; 
-  
-  return kTRUE ; 
-} 
+    fCollArea->FillAll(energy, impact);
+
+
+    if (fMcTrig->GetFirstLevel() <= 0)
+        return kTRUE;
+
+    fCollArea->FillSel(energy, impact);
+
+    return kTRUE ;
+}
 
 Bool_t MCollAreaTrigger::PostProcess ()