Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5113)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5114)
@@ -27,4 +27,5 @@
 
 
+
  2004/09/17: Thomas Bretz
 
@@ -57,4 +58,6 @@
    * mhflux/MHAlpha.[h,cc]:
      - added some fFit.Print to keep track of what's going on
+     - give a name to the function, no name results in weired
+       behaviour of the whole system. root people were already informed
 
    * mhflux/MHFalseSource.cc:
@@ -63,4 +66,7 @@
    * star.cc:
      - fixed handling of commandline arguments in batch mode
+
+   * mhist/MHEvent.[h,cc], mmain/MEventDisplay.cc:
+     - remove non working signal/ped rms
 
 
Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 5113)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 5114)
@@ -217,4 +217,5 @@
     f.fFunc = new TF1(*fFunc);
     gROOT->GetListOfFunctions()->Remove(f.fFunc);
+    f.fFunc->SetName("Dummy");
     delete fcn;
 }
Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h	(revision 5113)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h	(revision 5114)
@@ -46,4 +46,5 @@
 
         gROOT->GetListOfFunctions()->Remove(fFunc);
+        fFunc->SetName("Dummy");
     }
 
@@ -59,4 +60,10 @@
     void Print(Option_t *o=0) const;
     void Copy(TObject &o) const;
+    /*
+    TObject *Clone(const char *name) const
+    {
+        return new MAlphaFitter(*this);
+    }
+    */
 
     void SetSignalIntegralMax(Float_t s)   { fSigInt       = s; }
@@ -66,4 +73,5 @@
     void SetPolynomOrder(Int_t s)          { fPolynomOrder = s; delete fFunc; fFunc=new TF1 ("", Form("gaus(0) + pol%d(3)", s));
         gROOT->GetListOfFunctions()->Remove(fFunc);
+        fFunc->SetName("Dummy");
         fCoefficients.Set(3+s+1); fCoefficients.Reset(); }
 
Index: trunk/MagicSoft/Mars/mhist/MHEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 5113)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 5114)
@@ -139,8 +139,4 @@
         fHist->SetYTitle("\\sigma_{P} [au]");
         break;
-    case kEvtRelativeSignal:
-        fHist->SetName("Signal/PedRMS");
-        fHist->SetYTitle("S/P_{rms}");
-        break;
     case kEvtCleaningLevels:
         if (!fImgCleanStd)
@@ -212,7 +208,4 @@
     case kEvtPedestalRMS:
         fHist->SetCamContent(*event, 1);
-        break;
-    case kEvtRelativeSignal:
-        fHist->SetCamContent(*event, 0);
         break;
     case kEvtCleaningLevels:
Index: trunk/MagicSoft/Mars/mhist/MHEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 5113)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 5114)
@@ -21,5 +21,5 @@
     enum EventType_t {
         kEvtSignalRaw, kEvtSignalDensity, kEvtPedestal, 
-        kEvtPedestalRMS, kEvtRelativeSignal, kEvtCleaningLevels,
+        kEvtPedestalRMS, kEvtCleaningLevels,
         kEvtCleaningData,
         kEvtIdxMax, kEvtArrTime, kEvtTrigPix, kEvtIslandIndex
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 5113)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 5114)
@@ -253,5 +253,4 @@
     MHEvent *evt03 = new MHEvent(MHEvent::kEvtPedestal);
     MHEvent *evt04 = new MHEvent(MHEvent::kEvtPedestalRMS);
-    MHEvent *evt05 = new MHEvent(MHEvent::kEvtRelativeSignal);
     MHEvent *evt06a= new MHEvent(MHEvent::kEvtCleaningData);
     MHEvent *evt06b= new MHEvent(MHEvent::kEvtCleaningLevels);
@@ -265,5 +264,4 @@
     evt03->SetName("Pedestal");
     evt04->SetName("PedRMS");
-    evt05->SetName("Signal/PedRMS");
     evt06a->SetName("CleanData");
     evt06b->SetName("CleanLevels");
@@ -278,5 +276,4 @@
     plist->AddToList(evt03);
     plist->AddToList(evt04);
-    plist->AddToList(evt05);
     plist->AddToList(evt06a);
     plist->AddToList(evt06b);
@@ -292,5 +289,4 @@
     MFillH             *fill03 = new MFillH(evt03, "MPedPhotCam", "MFillH03");
     MFillH             *fill04 = new MFillH(evt04, "MPedPhotCam", "MFillH04");
-    MFillH             *fill05 = new MFillH(evt05, "MCameraData", "MFillH05");
     MFillH             *fill06a= new MFillH(evt06a, "MCameraData", "MFillH06a");
     MFillH             *fill06b= new MFillH(evt06b, "MCameraData", "MFillH06b");
@@ -359,5 +355,4 @@
     tlist->AddToList(fill03);
     tlist->AddToList(fill04);
-    tlist->AddToList(fill05);
     tlist->AddToList(fill06a);
     tlist->AddToList(fill06b);
@@ -629,10 +624,12 @@
     // Draw ellipse on top of all pads
     //
-    TObject *hillas = plist->FindObject("MHillas");
+    TObject *hillas1 = plist->FindObject("MHillas");
+    TObject *hillas2 = plist->FindObject("MHillasSrc");
     for (int i=1; i<7;i++)
     {
         TCanvas *c = GetCanvas(i);
         c->cd(1);
-        hillas->Draw();
+        hillas1->Draw();
+        hillas2->Draw();
     }
 }