Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5066)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5067)
@@ -69,5 +69,5 @@
      - removed MHTimeDiffTime   (use MHEffectiveOnTime instead)
      - removed MHTimeDiffTheta  (use MHEffectiveOnTime instead)
-
+     * If you need help to get MHEffectiveOnTIme working please ask me!
 
 
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc	(revision 5066)
+++ 	(revision )
@@ -1,155 +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    1/2002 <mailto:tbretz@uni-sw.gwdg.de>
-!   Author(s): Wolfgang Wittek 1/2002 <mailto:wittek@mppmu.mpg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2002
-!
-!
-\* ======================================================================== */
-
-//////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//  MHTimeDiffTheta                                                         //
-//                                                                          //
-//  calculates the 2D-histogram   time-difference vs. Theta                 //
-//                                                                          //
-//////////////////////////////////////////////////////////////////////////////
-
-#include "MHTimeDiffTheta.h"
-
-#include <TCanvas.h>
-
-#include "MTime.h"
-#include "MMcEvt.hxx"
-
-#include "MBinning.h"
-#include "MParList.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-ClassImp(MHTimeDiffTheta);
-
-using namespace std;
-
-// --------------------------------------------------------------------------
-//
-// Default Constructor. It sets name and title of the histogram.
-//
-MHTimeDiffTheta::MHTimeDiffTheta(const char *name, const char *title)
-    : fLastTime(0), fHist()
-{
-    //
-    //   set the name and title of this object
-    //
-    fName  = name  ? name  : "MHTimeDiffTheta";
-    fTitle = title ? title : "2-D histogram in Theta and time difference";
-
-    fHist.SetDirectory(NULL);
-
-    fHist.SetXTitle("\\Delta t [s]");
-    fHist.SetYTitle("\\Theta [\\circ]");
-}
-
-// --------------------------------------------------------------------------
-//
-// Set the binnings and prepare the filling of the histogram
-//
-Bool_t MHTimeDiffTheta::SetupFill(const MParList *plist)
-{
-   fTime = (MTime*)plist->FindObject("MTime");
-   if (!fTime)
-   {
-       *fLog << err << dbginf << "MTime not found... aborting." << endl;
-       return kFALSE;
-   }
-
-   fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
-   if (!fMcEvt)
-   {
-       *fLog << err << dbginf << "MMcEvt not found... aborting." << endl;
-       return kFALSE;
-   }
-
-   const MBinning* binsdtime = (MBinning*)plist->FindObject("BinningTimeDiff");
-   const MBinning* binstheta = (MBinning*)plist->FindObject("BinningTheta");
-   if (!binstheta || !binsdtime)
-   {
-       *fLog << err << dbginf << "At least one MBinning not found... aborting." << endl;
-       return kFALSE;      
-   }
-
-   SetBinning(&fHist, binsdtime, binstheta);
-
-   return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Draw the histogram
-//
-void MHTimeDiffTheta::Draw(Option_t *opt)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
-    pad->SetBorderMode(0);
-
-    AppendPad("");
-
-    TH1 *h;
-
-    pad->Divide(2,2);
-
-    pad->cd(1);
-    gPad->SetLogy();
-    h = fHist.ProjectionX("ProjX_Theta", -1, 9999, "E");
-    h->SetTitle("Distribution of \\Delta t [s]");
-    h->SetXTitle("\\Delta t [s]");
-    h->SetYTitle("Counts");
-    h->Draw(opt);
-    h->SetBit(kCanDelete);;
-
-    pad->cd(2);
-    h = fHist.ProjectionY("ProjY_timediff", -1, 9999, "E");
-    h->SetTitle("Distribution of \\Theta [\\circ]");
-    h->SetXTitle("\\Theta [\\circ]");
-    h->SetYTitle("Counts");
-    h->Draw(opt);
-    h->SetBit(kCanDelete);;
-
-    pad->cd(3);
-    fHist.Draw(opt);
-
-    pad->Modified();
-    pad->Update();
-}
-
-// --------------------------------------------------------------------------
-//
-//  Fill the histogram
-//
-Bool_t MHTimeDiffTheta::Fill(const MParContainer *par, const Stat_t w)
-{
-    const Double_t time = *fTime;
-
-    fHist.Fill(time-fLastTime, fMcEvt->GetTelescopeTheta()*kRad2Deg, w);
-    fLastTime = time;
-
-    return kTRUE;
-}
-
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.h	(revision 5066)
+++ 	(revision )
@@ -1,42 +1,0 @@
-#ifndef MARS_MHTimeDiffTheta
-#define MARS_MHTimeDiffTheta
-
-#ifndef MARS_MH
-#include "MH.h"
-#endif
-#ifndef ROOT_TH2
-#include <TH2.h>
-#endif
-
-class MTime;
-class MMcEvt;
-
-class MParList;
-
-class MHTimeDiffTheta : public MH
-{
-private:
-    MTime  *fTime;   //!
-    MMcEvt *fMcEvt;  //!
-    Double_t fLastTime;
-
-    TH2D    fHist;
-
-public:
-    MHTimeDiffTheta(const char *name=NULL, const char *title=NULL);
-
-    Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par, const Stat_t w=1);
-
-    const TH2D *GetHist() { return &fHist; }
-    const TH2D *GetHist() const { return &fHist; }
-
-    TH1 *GetHistByName(const TString name) { return &fHist; }
-
-    void Draw(Option_t *option="");
-
-    ClassDef(MHTimeDiffTheta, 0) //2D-histogram  time-diff vs. Theta
-};
-
-#endif
-
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc	(revision 5066)
+++ 	(revision )
@@ -1,146 +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    1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
-!   Author(s): Wolfgang Wittek 1/2002 <mailto:wittek@mppmu.mpg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2002
-!
-!
-\* ======================================================================== */
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  MHTimeDiffTime
-//
-//  calculates the 2D-histogram   time-difference vs. time
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-#include "MHTimeDiffTime.h"
-
-#include <TCanvas.h>
-
-#include "MTime.h"
-
-#include "MBinning.h"
-#include "MParList.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-ClassImp(MHTimeDiffTime);
-
-using namespace std;
-
-// --------------------------------------------------------------------------
-//
-// Default Constructor. It sets name and title of the histogram
-//
-MHTimeDiffTime::MHTimeDiffTime(const char *name, const char *title)
-    : fLastTime(0), fHist()
-{
-    //
-    //   set the name and title of this object
-    //
-    fName  = name  ? name  : "MHTimeDiffTime";
-    fTitle = title ? title : "2-D histogram in time and time difference";
-
-    fHist.SetDirectory(NULL);
-
-    fHist.SetXTitle("\\Delta t [s]");
-    fHist.SetYTitle("t [s]");
-}
-
-// --------------------------------------------------------------------------
-//
-// Set the binnings and prepare the filling of the histogram
-//
-Bool_t MHTimeDiffTime::SetupFill(const MParList *plist)
-{
-    fTime = (MTime*)plist->FindObject("MTime");
-    if (!fTime)
-    {
-        *fLog << err << dbginf << "MTime not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    const MBinning* binsdtime = (MBinning*)plist->FindObject("BinningTimeDiff");
-    const MBinning* binstime  = (MBinning*)plist->FindObject("BinningTime");
-    if (!binstime || !binsdtime)
-    {
-        *fLog << err << dbginf << "At least one MBinning not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    SetBinning(&fHist, binsdtime, binstime);
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Draw the histogram
-//
-void MHTimeDiffTime::Draw(Option_t *opt)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
-    pad->SetBorderMode(0);
-
-    AppendPad("");
-
-    pad->Divide(2,2);
-
-    TH1D *h;
-
-    pad->cd(1);
-    gPad->SetLogy();
-    h = fHist.ProjectionX("ProjX_sumtime", -1, 9999, "E");
-    h->SetTitle("Distribution of \\Delta t [s]");
-    h->SetXTitle("\\Delta t [s]");
-    h->SetYTitle("Counts");
-    h->Draw(opt);
-    h->SetBit(kCanDelete);
-
-    pad->cd(2);
-    h = fHist.ProjectionY("ProjY_sumtimediff", -1, 9999, "E");
-    h->SetTitle("Distribution of time [s]");
-    h->SetXTitle("time [s]");
-    h->SetYTitle("Counts");
-    h->Draw(opt);
-    h->SetBit(kCanDelete);
-
-    pad->cd(3);
-    fHist.DrawCopy(opt);
-
-    pad->Modified();
-    pad->Update();
-}
-
-// --------------------------------------------------------------------------
-//
-//  Fill the histogram
-//
-Bool_t MHTimeDiffTime::Fill(const MParContainer *par, const Stat_t w)
-{
-    const Double_t time = *fTime;
-
-    fHist.Fill(time-fLastTime, time, w);
-    fLastTime = time;
-
-    return kTRUE;
-}
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.h	(revision 5066)
+++ 	(revision )
@@ -1,40 +1,0 @@
-#ifndef MARS_MHTimeDiffTime
-#define MARS_MHTimeDiffTime
-
-#ifndef MARS_MH
-#include "MH.h"
-#endif
-#ifndef ROOT_TH2
-#include <TH2.h>
-#endif
-
-class MTime;
-
-class MParList;
-
-class MHTimeDiffTime : public MH
-{
-private:
-    MTime *fTime;   //!
-    Double_t  fLastTime;
-
-    TH2D   fHist;
-
-public:
-    MHTimeDiffTime(const char *name=NULL, const char *title=NULL);
-
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par, const Stat_t w=1);
-
-    const TH2D *GetHist() { return &fHist; }
-    const TH2D *GetHist() const { return &fHist; }
-
-    TH1 *GetHistByName(const TString name) { return &fHist; }
-
-    void Draw(Option_t *option="");
-
-    ClassDef(MHTimeDiffTime, 0) //2D-histogram  time-diff vs. time
-};
-
-#endif
-
Index: trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 5066)
+++ trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 5067)
@@ -200,6 +200,6 @@
     MFillH fill4("MHImagePar",    "MImagePar",    "FillImagePar");
     MFillH fill5("MHNewImagePar", "MNewImagePar", "FillNewImagePar");
-    MFillH fill6("MHImageParTime","MImageParTime","FillImageParTime");
-    MFillH fill7("MHNewImagePar2","MNewImagePar2","FillNewImagePar2");
+    //MFillH fill6("MHImageParTime","MImageParTime","FillImageParTime");
+    //MFillH fill7("MHNewImagePar2","MNewImagePar2","FillNewImagePar2");
     MFillH fill8(&h1,             "",             "FillEventRate");
     MFillH fill9("MHEffectiveOnTime", "MTime",    "FillEffOnTime");
@@ -219,6 +219,6 @@
     write.AddContainer("MImagePar",     "Events");
     write.AddContainer("MNewImagePar",  "Events");
-    write.AddContainer("MNewImagePar2", "Events");
-    write.AddContainer("MImageParTime", "Events");
+    //write.AddContainer("MNewImagePar2", "Events");
+    //write.AddContainer("MImageParTime", "Events");
     write.AddContainer("MRawEvtHeader", "Events");
     if (ismc)
@@ -270,6 +270,6 @@
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill5);
-    tlist2.AddToList(&fill6);
-    tlist2.AddToList(&fill7);
+    //tlist2.AddToList(&fill6);
+    //tlist2.AddToList(&fill7);
     //tlist2.AddToList(&fill9);
 
Index: trunk/MagicSoft/Mars/star.rc
===================================================================
--- trunk/MagicSoft/Mars/star.rc	(revision 5066)
+++ trunk/MagicSoft/Mars/star.rc	(revision 5067)
@@ -47,7 +47,7 @@
 # -------------------------------------------------------------------------
 # -------------------------------------------------------------------------
-#MJStar.MImgCleanStd.CleanLevel1: 3.5
-#MJStar.MImgCleanStd.CleanLevel2: 2
-#MJStar.MImgCleanStd.CleanMethod: Scaled
+MJStar.MImgCleanStd.CleanLevel1: 3.5
+MJStar.MImgCleanStd.CleanLevel2: 2
+MJStar.MImgCleanStd.CleanMethod: Scaled
 
 # -------------------------------------------------------------------------