Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 864)
+++ trunk/MagicSoft/Mars/Changelog	(revision 865)
@@ -11,4 +11,7 @@
    * mmontecarlo/MMcEnerHisto.[cc,h], mmontecarlo/MMcEnerThre.[cc,h], 
      mmontecarlo/MMcEnerThreCalc.[cc,h]:
+     - removed
+
+   * mmontecarlo/MCollArea.[cc,h], mmontecarlo/MCollAreaTrigger.[cc,h]:
      - removed
 
Index: trunk/MagicSoft/Mars/mmontecarlo/MCollArea.h
===================================================================
--- trunk/MagicSoft/Mars/mmontecarlo/MCollArea.h	(revision 864)
+++ 	(revision )
@@ -1,42 +1,0 @@
-#ifndef MCOLLAREA_H
-#define MCOLLAREA_H
-
-#ifndef MAGIC_H
-#include "MAGIC.h"
-#endif
-#ifndef MPARCONTAINER_H
-#include "MParContainer.h"
-#endif
-
-//
-// because of some strange reason this cannot be put into MonteCarloIncl
-//
-#ifndef ROOT_TH1
-#include <TH1.h>
-#endif
-
-class TH2D;
-
-class MCollArea : public MParContainer { 
-
- private: 
-  TH2D  *fHistAll ; //! all simulated showers
-  TH2D  *fHistSel ; //! the selected showers
-  TH1D  *fHistCol ; //  the collection area
-
- public: 
-  
-  MCollArea(const char *name=NULL, const char *title=NULL) ; 
-  ~MCollArea() ; 
-
-  void FillAll(Float_t log10E, Float_t radius) ;  
-  void FillSel(Float_t log10E, Float_t radius) ;  
-  void DrawAll() ;
-  void DrawSel() ;
-  void Draw(Option_t* option = "") ; 
-  void CalcEfficiency() ;
-
-  ClassDef(MCollArea, 1)  //  Data Container to calculate Collection Area
-} ; 
-
-#endif 
Index: trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.cc
===================================================================
--- trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.cc	(revision 864)
+++ 	(revision )
@@ -1,94 +1,0 @@
-/* ======================================================================== *\
-!
-! *
-! * 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): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
-!              Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
-!
-!   Copyright: MAGIC Software Development, 2000-2001
-!
-!
-\* ======================================================================== */
-
-#include "MCollAreaTrigger.h"
-
-#include "MParList.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-#include "MMcEvt.hxx"
-#include "MMcTrig.hxx" 
-
-#include "MHMcCollectionArea.h"
-
-ClassImp(MCollAreaTrigger)
-
-MCollAreaTrigger::MCollAreaTrigger (const char *name, const char *title)
-{
-    *fName  = name  ? name  : "MCollAreaTrigger";
-    *fTitle = title ? title : "Task to calc the collection area ";
-} 
-
-Bool_t MCollAreaTrigger::PreProcess (MParList *pList)
-{
-    // connect the raw data with this task
-
-    fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
-    if (!fMcEvt)
-    {
-        *fLog << dbginf << "MMcEvt not found... exit." << endl;
-        return kFALSE;
-    }
-
-    fMcTrig = (MMcTrig*)pList->FindObject("MMcTrig");
-    if (!fMcTrig)
-    {
-        *fLog << dbginf << "MMcTrig not found... exit." << endl;
-        return kFALSE;
-    }
-
-    fCollArea = (MHMcCollectionArea*)pList->FindCreateObj("MHMcCollectionArea");
-    if (!fCollArea)
-        return kFALSE;
-
-    return kTRUE;
-}
-
-Bool_t MCollAreaTrigger::Process () 
-{ 
-    const Float_t energy = log10(fMcEvt->GetEnergy());
-    const Float_t impact = fMcEvt->GetImpact()/100.;
-
-    fCollArea->FillAll(energy, impact);
-
-    if (fMcTrig->GetFirstLevel() <= 0)
-        return kTRUE;
-
-    fCollArea->FillSel(energy, impact);
-
-    return kTRUE;
-}
-
-Bool_t MCollAreaTrigger::PostProcess () 
-{ 
-    //
-    //   do the calculation of the effectiv area
-    //
-    fCollArea->CalcEfficiency();
-
-    return kTRUE;
-}
Index: trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.h
===================================================================
--- trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.h	(revision 864)
+++ 	(revision )
@@ -1,32 +1,0 @@
-#ifndef MMCCOLLECTIONAREACALC_H
-#define MMCCOLLECTIONAREACALC_H
-
-#ifndef MTASK_H
-#include "MTask.h"
-#endif
-
-class MParList;
-class MMcEvt;
-class MMcTrig;
-class MHMcCollectionArea;
-
-class MMcCollectionAreaCalc : public MTask
-{
-private:
-    MMcEvt  *fMcEvt;
-    MMcTrig *fMcTrig;
-
-    MHMcCollectionArea *fCollArea;
-
-public:
-    MMcCollectionAreaCalc(const char *name=NULL, const char *title=NULL);
-
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process() ;
-    Bool_t PostProcess() ;
-
-    ClassDef(MMcCollectionAreaCalc, 0) // Task to calculate the collection area histogram
-};
-
-#endif 
-