Index: trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.cc	(revision 7170)
+++ 	(revision )
@@ -1,183 +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): Thomas Bretz    12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
-!
-!   Copyright: MAGIC Software Development, 2000-2002
-!
-!
-\* ======================================================================== */
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// MHillasSrcCalc
-//
-// Task to calculate the source dependant part of the hillas parameters
-//
-// THE USE OF THIS TASK IS DEPRICATED. PLEASE USE MHillasCalc INSTEAD!!!
-//
-//
-//  Input Containers:
-//   MHillas
-//   [MSrcPosCam]
-//
-//  Output Containers:
-//   MHillasSrc
-//
-//////////////////////////////////////////////////////////////////////////////
-#include "MHillasSrcCalc.h"
-
-#include <fstream>
-
-#include "MParList.h"
-
-#include "MSrcPosCam.h"
-#include "MHillasSrc.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-ClassImp(MHillasSrcCalc);
-
-using namespace std;
-
-static const TString gsDefName  = "MHillasSrcCalc";
-static const TString gsDefTitle = "Calculate position dependant image parameters";
-
-// -------------------------------------------------------------------------
-//
-// Default constructor. The first argument is the name of a container
-// containing the source position in the camera plain (MScrPosCam).
-// The default is "MSrcPosCam". hil is the name of a container
-// of type MHillasSrc (or derived) in which the parameters are stored
-// The default is "MHillasSrc"
-//
-MHillasSrcCalc::MHillasSrcCalc(const char *src, const char *hil,
-                               const char *name, const char *title)
-    : fHillas(NULL), fSrcPos(NULL), fHillasSrc(NULL)
-{
-    fName  = name  ? name  : gsDefName.Data();
-    fTitle = title ? title : gsDefTitle.Data();
-
-    fSrcName     = src;
-    fHillasName  = hil;
-    fHillasInput = "MHillas";
-}
-
-// -------------------------------------------------------------------------
-//
-Int_t MHillasSrcCalc::PreProcess(MParList *pList)
-{
-    fHillas = (MHillas*)pList->FindObject(AddSerialNumber(fHillasInput), "MHillas");
-    if (!fHillas)
-    {
-        *fLog << err << dbginf << "MHillas not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fSrcPos = (MSrcPosCam*)pList->FindObject(AddSerialNumber(fSrcName), "MSrcPosCam");
-    if (!fSrcPos)
-    {
-        *fLog << warn << AddSerialNumber(fSrcName) << " [MSrcPosCam] not found... creating default container." << endl;
-        fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", AddSerialNumber(fSrcName));
-        if (!fSrcPos)
-            return kFALSE;
-    }
-
-    fHillasSrc = (MHillasSrc*)pList->FindCreateObj("MHillasSrc", AddSerialNumber(fHillasName));
-    if (!fHillasSrc)
-        return kFALSE;
-
-    fHillasSrc->SetSrcPos(fSrcPos);
-
-    fErrors = 0;
-
-    return kTRUE;
-}
-
-// -------------------------------------------------------------------------
-//
-Int_t MHillasSrcCalc::Process()
-{
-    if (fHillasSrc->Calc(*fHillas)>0)
-    {
-        fErrors++;
-        return kCONTINUE;
-
-    }
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-//  Prints some statistics about the hillas calculation. The percentage
-//  is calculated with respect to the number of executions of this task.
-//
-Int_t MHillasSrcCalc::PostProcess()
-{
-    if (GetNumExecutions()==0)
-        return kTRUE;
-
-    *fLog << inf << endl;
-    *fLog << GetDescriptor() << " execution statistics:" << endl;
-    *fLog << dec << setfill(' ');
-    *fLog << " " << fErrors << " (" << (int)(fErrors*100/GetNumExecutions()) << "%) Evts skipped due to: Calc>0" << endl;
-    *fLog << endl;
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Implementation of SavePrimitive. Used to write the call to a constructor
-// to a macro. In the original root implementation it is used to write
-// gui elements to a macro-file.
-//
-void MHillasSrcCalc::StreamPrimitive(ofstream &out) const
-{
-    if (fHillas && !fHillas->IsSavedAsPrimitive())
-        fHillas->StreamPrimitive(out);
-
-    if (fSrcPos && !fSrcPos->IsSavedAsPrimitive())
-        fSrcPos->StreamPrimitive(out);
-
-    if (fHillasSrc && !fHillasSrc->IsSavedAsPrimitive())
-        fHillasSrc->StreamPrimitive(out);
-
-    out << "   MHillasSrcCalc " << GetUniqueName() << "(";
-
-    if (fSrcPos)
-        out << "&" << fSrcPos->GetUniqueName();
-    else
-        out << "\"" << fSrcName << "\"";
-
-    out << ", ";
-
-    if (fHillasSrc)
-        out << "&" << fHillasSrc->GetUniqueName();
-    else
-        out << "\"" << fHillasName << "\"";
-
-    if (fName!=gsDefName || fTitle!=gsDefTitle)
-    {
-        out << ", \"" << fName << "\"";
-        if (fTitle!=gsDefTitle)
-            out << ", \"" << fTitle << "\"";
-    }
-    out << ");" << endl;
-}
Index: trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.h	(revision 7170)
+++ 	(revision )
@@ -1,41 +1,0 @@
-#ifndef MARS_MHillasSrcCalc
-#define MARS_MHillasSrcCalc
-
-#ifndef MARS_MTask
-#include "MTask.h"
-#endif
-
-class MHillas;
-class MHillasSrc;
-class MSrcPosCam;
-
-class MHillasSrcCalc : public MTask
-{
-private:
-    const MHillas    *fHillas;     //! Pointer to the source independant hillas parameters
-    const MSrcPosCam *fSrcPos;     //! Pointer to the source position
-          MHillasSrc *fHillasSrc;  //! Pointer to the output container for the source dependant parameters
-
-    TString     fSrcName;
-    TString     fHillasName;
-    TString     fHillasInput;
-
-    Int_t       fErrors;
-
-    void StreamPrimitive(ofstream &out) const;
-
-    Int_t PreProcess(MParList *plist);
-    Int_t Process();
-    Int_t PostProcess();
-
-public:
-    MHillasSrcCalc(const char *src="MSrcPosCam", const char *hil="MHillasSrc",
-                   const char *name=NULL, const char *title=NULL);
-
-    void SetInput(TString hilname) { fHillasInput = hilname; }
-
-    ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters
-};
-
-#endif
-
