Index: trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc
===================================================================
--- trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc	(revision 8706)
+++ 	(revision )
@@ -1,387 +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 Hengstebeck 2/2005 <mailto:hengsteb@physik.hu-berlin.de>
-!   Author(s): Thomas Bretz 8/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2005
-!
-!
-\* ======================================================================== */
-
-/////////////////////////////////////////////////////////////////////////////
-//
-//  MRFEnergyEst
-//
-//
-////////////////////////////////////////////////////////////////////////////
-#include "MRFEnergyEst.h"
-
-#include <TVector.h>
-
-#include "MHMatrix.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-#include "MData.h"
-#include "MDataArray.h"
-
-#include "MRanForest.h"
-#include "MParameters.h"
-
-#include "MParList.h"
-#include "MTaskList.h"
-#include "MEvtLoop.h"
-#include "MRanForestGrow.h"
-
-ClassImp(MRFEnergyEst);
-
-using namespace std;
-
-const TString MRFEnergyEst::gsDefName  = "MRFEnergyEst";
-const TString MRFEnergyEst::gsDefTitle = "RF for energy estimation";
-
-MRFEnergyEst::MRFEnergyEst(const char *name, const char *title)
-    : fDebug(kFALSE), fData(0), fEnergyEst(0),
-    fNumTrees(-1), fNumTry(-1), fNdSize(-1), 
-    fTestMatrix(0), fEstimationMode(kMean)
-{
-    fName  = name  ? name  : gsDefName.Data();
-    fTitle = title ? title : gsDefTitle.Data();
-
-    // FIXME:
-    fNumTrees = 100; //100
-    fNumTry   = 5;   //3
-    fNdSize   = 0;   //1   0 means: in MRanForest estimated best value will be calculated
-}
-
-MRFEnergyEst::~MRFEnergyEst()
-{
-    fEForests.Delete();
-}
-
-Int_t MRFEnergyEst::Train(const MHMatrix &matrixtrain, const TArrayD &grid, Int_t ver)
-{
-    gLog.Separator("MRFEnergyEst - Train");
-
-    if (!matrixtrain.GetColumns())
-    {
-        *fLog << err << "ERROR - MHMatrix does not contain rules... abort." << endl;
-        return kFALSE;
-    }
-
-    const Int_t ncols = matrixtrain.GetM().GetNcols();
-    const Int_t nrows = matrixtrain.GetM().GetNrows();
-    if (ncols<=0 || nrows <=0)
-    {
-        *fLog << err << "ERROR - No. of columns or no. of rows of matrixtrain equal 0 ... abort." << endl;
-        return kFALSE;
-    }
-
-    // rules (= combination of image par) to be used for energy estimation
-    TFile fileRF(fFileName, "recreate");
-    if (!fileRF.IsOpen())
-    {
-        *fLog << err << "ERROR - File to store RFs could not be opened... abort." << endl;
-        return kFALSE;
-    }
-
-    const Int_t nobs = 3; // Number of obsolete columns
-
-    const MDataArray &dcol = *matrixtrain.GetColumns();
-
-    MDataArray usedrules;
-    for (Int_t i=0; i<ncols-nobs; i++) // -3 is important!!!
-        usedrules.AddEntry(dcol[i].GetRule());
-
-    MDataArray rules(usedrules);
-    rules.AddEntry(ver<2?"Classification":dcol[ncols-1].GetRule());
-
-    // prepare matrix for current energy bin
-    TMatrix mat(matrixtrain.GetM());
-
-    // last column must be removed (true energy col.)
-    mat.ResizeTo(nrows, ncols-nobs+1);
-
-    if (fDebug)
-        gLog.SetNullOutput(kTRUE);
-
-    const Int_t nbins = ver>0 ? 1 : grid.GetSize()-1;
-    for (Int_t ie=0; ie<nbins; ie++)
-    {
-        switch (ver)
-        {
-        case 0: // Replace Energy Grid by classification
-            {
-                Int_t irows=0;
-                for (Int_t j=0; j<nrows; j++)
-                {
-                    const Double_t energy = matrixtrain.GetM()(j,ncols-1);
-                    const Bool_t   inside = energy>grid[ie] && energy<=grid[ie+1];
-
-                    mat(j, ncols-nobs) = inside ? 1 : 0;
-
-                    if (inside)
-                        irows++;
-                }
-                if (irows==0)
-                    *fLog << warn << "WARNING - Skipping";
-                else
-                    *fLog << inf << "Training RF for";
-
-                *fLog << " energy bin " << ie << " (" << grid[ie] << ", " << grid[ie+1] << ") " << irows << "/" << nrows << endl;
-
-                if (irows==0)
-                    continue;
-            }
-            break;
-
-        case 1: // Use Energy as classifier
-        case 2:
-            for (Int_t j=0; j<nrows; j++)
-                mat(j, ncols-nobs) = matrixtrain.GetM()(j,ncols-1);
-            break;
-        }
-
-        MHMatrix matrix(mat, &rules, "MatrixTrain");
-
-        MParList plist;
-        MTaskList tlist;
-        plist.AddToList(&tlist);
-        plist.AddToList(&matrix);
-
-        MRanForest rf;
-        rf.SetNumTrees(fNumTrees);
-        rf.SetNumTry(fNumTry);
-        rf.SetNdSize(fNdSize);
-        rf.SetClassify(ver<2 ? 1 : 0);
-        if (ver==1)
-            rf.SetGrid(grid);
-
-        plist.AddToList(&rf);
-
-        MRanForestGrow rfgrow;
-        tlist.AddToList(&rfgrow);
-
-        MEvtLoop evtloop;
-        evtloop.SetParList(&plist);
-
-        if (!evtloop.Eventloop())
-            return kFALSE;
-
-        if (fDebug)
-            gLog.SetNullOutput(kFALSE);
-
-        if (ver==0)
-        {
-            // Calculate bin center
-            const Double_t E = (TMath::Log10(grid[ie])+TMath::Log10(grid[ie+1]))/2;
-
-            // save whole forest
-            rf.SetUserVal(E);
-            rf.SetName(Form("%.10f", E));
-        }
-
-        rf.Write();
-    }
-
-    // save rules
-    usedrules.Write("rules");
-
-    return kTRUE;
-}
-
-Int_t MRFEnergyEst::ReadForests(MParList &plist)
-{
-    TFile fileRF(fFileName, "read");
-    if (!fileRF.IsOpen())
-    {
-        *fLog << err << dbginf << "File containing RFs could not be opened... aborting." << endl;
-        return kFALSE;
-    }
-
-    fEForests.Delete();
-
-    TIter Next(fileRF.GetListOfKeys());
-    TObject *o=0;
-    while ((o=Next()))
-    {
-        MRanForest *forest=0;
-        fileRF.GetObject(o->GetName(), forest);
-        if (!forest)
-            continue;
-
-        forest->SetUserVal(atof(o->GetName()));
-
-        fEForests.Add(forest);
-    }
-
-    // Maybe fEForests[0].fRules yould be used instead?
-
-    if (fData->Read("rules")<=0)
-    {
-        *fLog << err << "ERROR - Reading 'rules' from file " << fFileName << endl;
-        return kFALSE;
-    }
-
-    return kTRUE;
-}
-
-Int_t MRFEnergyEst::PreProcess(MParList *plist)
-{
-    fEnergyEst = (MParameterD*)plist->FindCreateObj("MParameterD", "MEnergyEst");
-    if (!fEnergyEst)
-        return kFALSE;
-
-    fData = (MDataArray*)plist->FindCreateObj("MDataArray");
-    if (!fData)
-        return kFALSE;
-
-    if (!ReadForests(*plist))
-    {
-        *fLog << err << "Reading RFs failed... aborting." << endl;
-        return kFALSE;
-    }
-
-    *fLog << inf << "RF read from " << fFileName << endl;
-
-    if (fTestMatrix)
-        return kTRUE;
-
-    fData->Print();
-
-    if (!fData->PreProcess(plist))
-    {
-        *fLog << err << "PreProcessing of the MDataArray failed... aborting." << endl;
-        return kFALSE;
-    }
-
-    return kTRUE;
-}
-
-#include <TGraph.h>
-#include <TF1.h>
-Int_t MRFEnergyEst::Process()
-{
-    TVector event;
-    if (fTestMatrix)
-        *fTestMatrix >> event;
-    else
-        *fData >> event;
-
-    // --------------- Single Tree RF -------------------
-    if (fEForests.GetEntries()==1)
-    {
-        MRanForest *rf = (MRanForest*)fEForests[0];
-        fEnergyEst->SetVal(rf->CalcHadroness(event));
-        fEnergyEst->SetReadyToSave();
-
-        return kTRUE;
-    }
-
-    // --------------- Multi Tree RF -------------------
-    static TF1 f1("f1", "gaus");
-
-    Double_t sume = 0;
-    Double_t sumh = 0;
-    Double_t maxh = 0;
-    Double_t maxe = 0;
-
-    Double_t max  = -1e10;
-    Double_t min  =  1e10;
-
-    //TH1C h("", "", fEForests.GetSize(), 0, 1);
-
-    TIter Next(&fEForests);
-    MRanForest *rf = 0;
-
-    TGraph g;
-    while ((rf=(MRanForest*)Next()))
-    {
-        const Double_t h = rf->CalcHadroness(event);
-        const Double_t e = rf->GetUserVal();
-
-        g.SetPoint(g.GetN(), e, h);
-
-        sume += e*h;
-        sumh += h;
-
-        if (h>maxh)
-        {
-            maxh = h;
-            maxe = e;
-        }
-        if (e>max)
-            max = e;
-        if (e<min)
-            min = e;
-    }
-
-    switch (fEstimationMode)
-    {
-    case kMean:
-        fEnergyEst->SetVal(pow(10, sume/sumh));
-        break;
-    case kMaximum:
-        fEnergyEst->SetVal(pow(10, maxe));
-        break;
-    case kFit:
-        f1.SetParameter(0, maxh);
-        f1.SetParameter(1, maxe);
-        f1.SetParameter(2, 0.125);
-        g.Fit(&f1, "Q0N");
-        fEnergyEst->SetVal(pow(10, f1.GetParameter(1)));
-        break;
-    }
-
-    fEnergyEst->SetReadyToSave();
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-//
-Int_t MRFEnergyEst::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
-{
-    Bool_t rc = kFALSE;
-    if (IsEnvDefined(env, prefix, "FileName", print))
-    {
-        rc = kTRUE;
-        SetFileName(GetEnvValue(env, prefix, "FileName", fFileName));
-    }
-    if (IsEnvDefined(env, prefix, "Debug", print))
-    {
-        rc = kTRUE;
-        SetDebug(GetEnvValue(env, prefix, "Debug", fDebug));
-    }
-    if (IsEnvDefined(env, prefix, "EstimationMode", print))
-    {
-        TString txt = GetEnvValue(env, prefix, "EstimationMode", "");
-        txt = txt.Strip(TString::kBoth);
-        txt.ToLower();
-        if (txt==(TString)"mean")
-            fEstimationMode = kMean;
-        if (txt==(TString)"maximum")
-            fEstimationMode = kMaximum;
-        if (txt==(TString)"fit")
-            fEstimationMode = kFit;
-        rc = kTRUE;
-    }
-    return rc;
-}
Index: trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h
===================================================================
--- trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h	(revision 8706)
+++ 	(revision )
@@ -1,95 +1,0 @@
-#ifndef MARS_MRFEnergyEst
-#define MARS_MRFEnergyEst
-
-#ifndef MARS_MTask
-#include "MTask.h"
-#endif
-
-#ifndef ROOT_TObjArray
-#include <TObjArray.h>
-#endif
-
-#ifndef ROOT_TArrayD
-#include <TArrayD.h>
-#endif
-
-class MDataArray;
-class MParameterD;
-class MHMatrix;
-
-class MRFEnergyEst : public MTask
-{
-public:
-    enum EstimationMode_t
-    {
-        kMean,
-        kMaximum,
-        kFit
-    };
-
-private:
-    static const TString gsDefName;   //! Default Name
-    static const TString gsDefTitle;  //! Default Title
-
-    Bool_t       fDebug;      // Debugging of eventloop while training on/off
-
-    TString      fFileName;   // File name to forest
-    TObjArray    fEForests;   // List of forests
-
-    MDataArray  *fData;       //! Used to store the MDataChains to get the event values
-    MParameterD *fEnergyEst;  //! Used to storeestimated energy
-
-    Int_t        fNumTrees;   //! Training parameters
-    Int_t        fNumTry;     //! Training parameters
-    Int_t        fNdSize;     //! Training parameters
-
-    MHMatrix    *fTestMatrix; //! Test Matrix used in Process (together with MMatrixLoop)
-
-    EstimationMode_t fEstimationMode;
-
-private:
-    // MTask
-    Int_t PreProcess(MParList *plist);
-    Int_t Process();
-
-    // MRFEnergyEst
-    Int_t ReadForests(MParList &plist);
-
-    // MParContainer
-    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
-
-    // Train Interface
-    Int_t Train(const MHMatrix &n, const TArrayD &grid, Int_t ver=2);
-
-public:
-    MRFEnergyEst(const char *name=NULL, const char *title=NULL);
-    ~MRFEnergyEst();
-
-    // Setter for estimation
-    void SetFileName(TString filename)          { fFileName = filename; }
-    void SetEstimationMode(EstimationMode_t op) { fEstimationMode = op; }
-
-    // Setter for training
-    void SetNumTrees(UShort_t n=100) { fNumTrees = n; }
-    void SetNdSize(UShort_t n=5)     { fNdSize   = n; }
-    void SetNumTry(UShort_t n=0)     { fNumTry   = n; }
-    void SetDebug(Bool_t b=kTRUE)    { fDebug = b; }
-
-    // Train Interface
-    Int_t TrainMultiRF(const MHMatrix &n, const TArrayD &grid)
-    {
-        return Train(n, grid, 0);
-    }
-    Int_t TrainSingleRF(const MHMatrix &n, const TArrayD &grid=TArrayD())
-    {
-        return Train(n, grid, grid.GetSize()==0 ? 2 : 1);
-    }
-
-    // Test Interface
-    void  SetTestMatrix(MHMatrix *m=0) { fTestMatrix=m; }
-    void  InitMapping(MHMatrix *m=0)   { fTestMatrix=m; }
-
-    ClassDef(MRFEnergyEst, 0) // Task
-};
-
-#endif