Changeset 1076

Timestamp:

11/14/01 10:03:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile.conf.linux (modified) (1 diff)
• Makefile.conf.linux-gnu (modified) (1 diff)
• macros/readCT1.C (modified) (2 diffs)
• macros/readMagic.C (modified) (3 diffs)
• manalysis/MImgCleanStd.cc (modified) (2 diffs)
• manalysis/MImgCleanStd.h (modified) (3 diffs)
• mbase/BaseLinkDef.h (modified) (1 diff)
• mbase/MGGroupFrame.cc (added)
• mbase/MGGroupFrame.h (added)
• mbase/MGList.cc (added)
• mbase/MGList.h (added)
• mbase/MGTask.cc (added)
• mbase/MGTask.h (added)
• mbase/MInputStreamID.cc (modified) (1 diff)
• mbase/MParContainer.cc (modified) (4 diffs)
• mbase/MParContainer.h (modified) (2 diffs)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MParList.h (modified) (1 diff)
• mbase/MTask.cc (modified) (4 diffs)
• mbase/MTask.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (3 diffs)
• mbase/MTaskList.h (modified) (1 diff)
• mbase/MTime.cc (modified) (1 diff)
• mbase/MWriteRootFile.cc (modified) (1 diff)
• mbase/Makefile (modified) (1 diff)
• mgui/MHexagon.cc (modified) (2 diffs)
• mgui/MHexagon.h (modified) (1 diff)
• mhist/MFillH.cc (modified) (1 diff)
• mmain/MAnalysis.cc (modified) (6 diffs)
• mmain/MAnalysis.h (modified) (2 diffs)
• mraw/MRawEvtData.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2001/11/09: Thomas Bretz
+
+   * mbase/MGList.[h,cc], mbase/MGTask.[h,cc], mbase/MGGroupFrame.[h,cc]:
+     - added
+
+   * Makefile.conf.linux, Makefile.conf.linux-gnu:
+     - changed to O3
+     - added -fnonnull-objects
+     - added -Woverloaded-virtual
+
+   * macros/readCT1.C, macros/readMagic.C:
+     - changed to use MClone
+
+   * manalysis/MImgCleanStd.[h,cc]:
+     - derived from TGTask
+     - added CreateGuiElements 
+     - added ProcessMessage
+
+   * mbase/BaseLinkDef.h, mbase/Makefile:
+     - added MGTask
+     - added MGList
+     - added MGGroupFrame
+
+   * mbase/MInputStreamID.cc:
+     - rmoved old comment
+
+   * mbase/MParContainer.[h,cc]:
+     - changed output
+     - made Hash const
+     - added GetDiscriptor
+
+   * mbase/MParList.[h,cc]:
+     - made FindObject const correct (see TObject)
+
+   * mbase/MTask.[h,cc]:
+     - changed output to use GetDescriptor
+     - made Call* functions virtual (used in TGTask)
+
+   * mbase/MTaskList.[h,cc]:
+     - made FindObject const correct (see TObject)
+     - changed output to use GetDescriptor
+
+   * mbase/MTime.cc:
+     - code reformatting
+
+   * mbase/MWriteRootFile.cc:
+     - small changes in output
+
+   * mgui/MHexagon.cc:
+     - changed output according to TEllipse and similar
+     - made ls const
+
+   * mhist/MFillH.cc:
+     - changed output to use GetDescriptor
+
+   * mmain/MAnalysis.[h,cc]:
+     - changed to use new GUI of MImgCleanStd
+
+   * mraw/MRawEvtData.cc:
+     - small changes to output
+     - better sanity check for non existing fRunHeader
+
+
+
  2001/11/09: Thomas Bretz
 

trunk/MagicSoft/Mars/Makefile.conf.linux

@@ -20 +20 @@
 #  ----->>>   settings for compilation
 #
-OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
+OPTIM    = -O3 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
 DEBUG    =
 ARCHDEF  = -D__LINUX__

trunk/MagicSoft/Mars/Makefile.conf.linux-gnu

@@ -20 +20 @@
 #
 
-OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs 
+OPTIM    = -O3 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
 DEBUG    =
 ARCHDEF  = -D__LINUX__

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -37 +37 @@
 
     MCT1ReadAscii read("/home/tbretz/data/CT1_97_off1.dat");
+    MClone        clone("MCerPhotEvt");
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
 
     tlist.AddToList(&read);
+    tlist.AddToList(&clone);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
@@ -50 +52 @@
         return;
 
-    MCerPhotEvt &phevt = *(MCerPhotEvt*)plist->FindObject("MCerPhotEvt");
-
     Int_t icount = 0;
     MCamDisplay display(&geomcam);
     display.Draw();
 
-    while (read.Process())
+    while (tlist.Process())
     {
-        cout << "Event: " << icount++  << endl;
-        hillas.Reset();
+        cout << "Event #" << icount++ << endl;
 
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());
         gClient->HandleInput();
         if(getchar()=='q')
             break;
 
-        clean.Process();
-
-        if (hcalc.Process()==kCONTINUE)
-        {
-            cout << "skipped." << endl;
-            continue;
-        }
-
         hillas.Print();
         hillas.Draw();
-
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
         gClient->HandleInput();

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -40 +40 @@
     MReadTree    read("Events", "~/data/camera.root");
     MCerPhotCalc ncalc;
+    MClone       clone("MCerPhotEvt");
     MImgCleanStd clean;
     MHillasCalc  hcalc;
@@ -45 +46 @@
     tlist.AddToList(&read);
     tlist.AddToList(&ncalc);
+    tlist.AddToList(&clone);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
@@ -54 +56 @@
         return;
 
-    MCerPhotEvt &phevt = *(MCerPhotEvt*)plist.FindObject("MCerPhotEvt");
-
     MCamDisplay display(&geomcam);
     display.Draw();
 
-    while (read.Process())
+    while (tlist.Process())
     {
-        cout << "Event #" << read.GetEventNum() ":" << endl;
-        hillas.Reset();
-        phevt.Reset();
+        cout << "Event #" << read.GetEventNum() << endl;
 
-        ncalc.Process();
-
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());
         gClient->HandleInput();
         if(getchar()=='q')
             break;
 
-        clean.Process();
-        hcalc.Process();
-
         hillas.Print();
         hillas.Draw();
-
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
         gClient->HandleInput();

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -258 +258 @@
     return kTRUE;
 }
-    
+
+
 // --------------------------------------------------------------------------
 //
@@ -272 +273 @@
 }
 
+#include <stdlib.h>       // atof
+
+#include <TGFrame.h>      // TGFrame
+#include <TGLabel.h>      // TGLabel
+#include <TGTextEntry.h>  // TGTextEntry
+
+#include "MGGroupFrame.h" // MGGroupFrame
+
+enum {
+    kImgCleanLvl1,
+    kImgCleanLvl2
+};
+
+void MImgCleanStd::CreateGuiElements(MGGroupFrame *f)
+{
+    //
+    // Create a frame for line 3 and 4 to be able
+    // to align entry field and label in one line
+    //
+    TGHorizontalFrame *f1 = new TGHorizontalFrame(f, 0, 0);
+    TGHorizontalFrame *f2 = new TGHorizontalFrame(f, 0, 0);
+
+    /*
+     * --> use with root >=3.02 <--
+     *
+
+     TGNumberEntry *fNumEntry1 = new TGNumberEntry(frame, 3.0, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative);
+     TGNumberEntry *fNumEntry2 = new TGNumberEntry(frame, 2.5, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative);
+
+     */
+    TGTextEntry *entry1 = new TGTextEntry(f1, "****", kImgCleanLvl1);
+    TGTextEntry *entry2 = new TGTextEntry(f2, "****", kImgCleanLvl2);
+
+    // --- doesn't work like expected (until root 3.02?) --- fNumEntry1->SetAlignment(kTextRight);
+    // --- doesn't work like expected (until root 3.02?) --- fNumEntry2->SetAlignment(kTextRight);
+
+    entry1->SetText("3.0");
+    entry2->SetText("2.5");
+
+    entry1->Associate(f);
+    entry2->Associate(f);
+
+    TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1 for standard image cleaning.");
+    TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2 for standard image cleaning.");
+
+    l1->SetTextJustify(kTextLeft);
+    l2->SetTextJustify(kTextLeft);
+
+    //
+    // Align the text of the label centered, left in the row
+    // with a left padding of 10
+    //
+    TGLayoutHints *laylabel = new TGLayoutHints(kLHintsCenterY|kLHintsLeft, 10);
+    TGLayoutHints *layframe = new TGLayoutHints(kLHintsCenterY|kLHintsLeft,  5, 0, 10);
+
+    //
+    // Add one entry field and the corresponding label to each line
+    //
+    f1->AddFrame(entry1);
+    f2->AddFrame(entry2);
+
+    f1->AddFrame(l1, laylabel);
+    f2->AddFrame(l2, laylabel);
+
+    f->AddFrame(f1, layframe);
+    f->AddFrame(f2, layframe);
+
+    f->AddToList(entry1);
+    f->AddToList(entry2);
+    f->AddToList(l1);
+    f->AddToList(l2);
+    f->AddToList(laylabel);
+    f->AddToList(layframe);
+}
+
+Bool_t MImgCleanStd::ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2)
+{
+    if (msg!=kC_TEXTENTRY || submsg!=kTE_ENTER)
+        return kTRUE;
+
+    TGTextEntry *txt = (TGTextEntry*)FindWidget(param1);
+
+    if (!txt)
+        return kTRUE;
+
+    Float_t lvl = atof(txt->GetText());
+
+    switch (param1)
+    {
+    case kImgCleanLvl1:
+        fCleanLvl1 = lvl;
+        *fLog << "Cleaning level 1 set to " << lvl << " sigma." << endl;
+        return kTRUE;
+
+    case kImgCleanLvl2:
+        fCleanLvl2 = lvl;
+        *fLog << "Cleaning level 2 set to " << lvl << " sigma." << endl;
+        return kTRUE;
+    }
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h

@@ -2 +2 @@
 #define MARS_MImgCleanStd
 
-#ifndef MARS_MTask
-#include "MTask.h"
+#ifndef MARS_MGTask
+#include "MGTask.h"
 #endif
 
@@ -9 +9 @@
 class MCerPhotEvt;
 
-class MImgCleanStd : public MTask
+class MGGroupFrame;
+
+class MImgCleanStd : public MGTask
 {
 private:
-    const MGeomCam *fCam;
-          MCerPhotEvt *fEvt;
+    const MGeomCam    *fCam;  //!
+          MCerPhotEvt *fEvt;  //!
 
     Float_t fCleanLvl1;
     Float_t fCleanLvl2;
+
+    void CreateGuiElements(MGGroupFrame *f);
 
 public:
@@ -26 +30 @@
     void CleanStep3();
 
-    Bool_t PreProcess (MParList *pList);
+    Bool_t PreProcess(MParList *pList);
     Bool_t Process();
+
+    Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);
 
     ClassDef(MImgCleanStd, 0)    // task doing a standard image cleaning

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -31 +31 @@
 #pragma link C++ class MInputStreamID+;
 
+#pragma link C++ class MGTask+;
+#pragma link C++ class MGList+;
+#pragma link C++ class MGGroupFrame+;
+
 #pragma link C++ class MClone+;
 #pragma link C++ class MPrint+;

trunk/MagicSoft/Mars/mbase/MInputStreamID.cc

@@ -47 +47 @@
     fTitle = title;
 
-    fStreamId = "All"; //new char[4];
-    //strcpy(fStreamId, "All");
+    fStreamId = "All";
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -137 +137 @@
 {
     TROOT::IndentLevel();
-    *fLog <<"OBJ: " << IsA()->GetName() << "\t" << GetName() << "\t" << GetTitle() << " : "
+    *fLog <<"OBJ: " << GetDescriptor() << ": " << GetTitle() << ", "
         << Int_t(TestBit(kCanDelete)) << endl;
 }
@@ -147 +147 @@
 void MParContainer::Print(Option_t *) const
 {
-    *fLog <<"OBJ: " << IsA()->GetName() << "\t" << GetName() << "\t" << GetTitle() << endl;
+    *fLog <<"OBJ: " << GetDescriptor() << ": " << GetTitle() << endl;
 }
 
@@ -199 +199 @@
 {
     *fLog << "To use the the ascii input of " << GetName();
-    *fLog << " you have to overload " << GetName() << "::AsciiRead." << endl;
+    *fLog << " you have to overload " << ClassName() << "::AsciiRead." << endl;
 }
 
@@ -205 +205 @@
 {
     *fLog << "To use the the ascii output of " << GetName();
-    *fLog << " you have to overload " << GetName() << "::AsciiWrite." << endl;
-}
+    *fLog << " you have to overload " << ClassName() << "::AsciiWrite." << endl;
+}

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -100 +100 @@
     virtual ~MParContainer() {}
 
+    virtual const char *GetDescriptor() const { return Form("%s [%s]", GetName(), ClassName()); }
+
     virtual TObject    *Clone(const char *newname="") const;
     virtual Int_t       Compare(const TObject *obj) const;
@@ -107 +109 @@
     virtual const char *GetName() const    { return fName.Data(); }
     virtual const char *GetTitle() const   { return fTitle.Data(); }
-    virtual ULong_t     Hash()             { return fName.Hash(); }
+    virtual ULong_t     Hash() const       { return fName.Hash(); }
     virtual Bool_t      IsSortable() const { return kTRUE; }
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -227 +227 @@
 //  check if the object is in the list or not
 //
-TObject *MParList::FindObject(TObject *obj) const
+TObject *MParList::FindObject(const TObject *obj) const
 {
     return fContainer->FindObject(obj);

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -44 +44 @@
 
     TObject       *FindObject(const char *name) const;
-    TObject       *FindObject(TObject *obj) const;
+    TObject       *FindObject(const TObject *obj) const;
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -67 +67 @@
 #include "MTask.h"
 
+#include <TMethod.h>
 #include <TOrdCollection.h>
 
@@ -73 +74 @@
 
 #include "MFilter.h"
+#include "MGGroupFrame.h"
 
 ClassImp(MTask);
@@ -176 +178 @@
 
     fIsPreprocessed = kFALSE;
+
     return PostProcess();
 }
@@ -224 +227 @@
 void MTask::PrintStatistics(const Int_t lvl) const
 {
-    *fLog << setw(lvl) << " " << GetName() << " [";
-    *fLog << ClassName() << "] \t" << fNumExecutions;
-    *fLog << endl;
-}
+    *fLog << setw(lvl) << " " << GetDescriptor() << "\t";
+    *fLog << dec << fNumExecutions << endl;
+}
+

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -73 +73 @@
     UInt_t GetNumExecutions() { return fNumExecutions; }
 
-    Bool_t CallPreProcess(MParList *plist);
-    Bool_t CallProcess();
-    Bool_t CallPostProcess();
+    virtual Bool_t CallPreProcess(MParList *plist);
+    virtual Bool_t CallProcess();
+    virtual Bool_t CallPostProcess();
 
     const TOrdCollection *GetListOfBranches() const { return fListOfBranches; }
 
-    ClassDef(MTask, 0)          //Abstract base class for a task
+    ClassDef(MTask, 0) //Abstract base class for a task
 };
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -197 +197 @@
 //  check if the object is in the list or not
 //
-TObject *MTaskList::FindObject(TObject *obj) const
+TObject *MTaskList::FindObject(const TObject *obj) const
 {
     return fTasks->FindObject(obj);
@@ -360 +360 @@
         *fLog << "Execution Statistics: " << endl;
         *fLog << "---------------------" << endl;
-        *fLog << GetName() << " [" << ClassName() << "]" << endl;
+        *fLog << GetDescriptor() << endl;
     }
     else
     {
-        *fLog << setw(lvl) << " " << GetName() << " [";
-        *fLog << ClassName() << "]" << endl;
+        *fLog << setw(lvl) << " " << GetDescriptor() << endl;
     }
 
@@ -380 +379 @@
 void MTaskList::Print(Option_t *t) const
 {
-    *fLog << "TaskList: " << GetName() << " <" << GetTitle() << ">" << endl;
+    *fLog << GetDescriptor() << " <" << GetTitle() << ">" << endl;
 
     fTasks->Print();

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -40 +40 @@
 
     TObject *FindObject(const char *name) const;
-    TObject *FindObject(TObject *obj) const;
+    TObject *FindObject(const TObject *obj) const;
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -43 +43 @@
     fLog->setf(ios::showbase);
     *fLog << "MTime Information:  " << hex 
-        << " " <<setfill('0') << setw(2) << fTimeStamp[0]
-        << " " <<setfill('0') << setw(2) << fTimeStamp[1] << endl << endl;
+        << " " << setfill('0') << setw(2) << fTimeStamp[0]
+        << " " << setfill('0') << setw(2) << fTimeStamp[1] << endl << endl;
 } 
 

trunk/MagicSoft/Mars/mbase/MWriteRootFile.cc

@@ -116 +116 @@
 void MWriteRootFile::Print(Option_t *) const
 {
-    cout << "File: " << GetFileName() << endl;
+    cout << "File: " << GetFileName() << dec << endl;
     cout << "--------------------------------------------------" << endl;
 

trunk/MagicSoft/Mars/mbase/Makefile

@@ -44 +44 @@
            MWriteAsciiFile.cc \
            MWriteRootFile.cc \
+           MGList.cc \
+           MGTask.cc \
+           MGGroupFrame.cc \
            MArray.cc \
            MArrayB.cc \

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -191 +191 @@
 //  list this hexagon with its attributes
 //
-void MHexagon::ls(Option_t *)
+void MHexagon::ls(const Option_t *) const
 {
     TROOT::IndentLevel();
@@ -247 +247 @@
 void MHexagon::Print(Option_t *) const
 {
-    cout << "MHexagon - " << GetName() << ": ";
+    cout << "MHexagon: ";
     cout << "x=" << fX << "mm y=" << fY << "mm r=" << fD << "mm" << endl;
 

trunk/MagicSoft/Mars/mgui/MHexagon.h

@@ -51 +51 @@
     //virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
 
-    virtual void  ls (Option_t *Option="");
+    virtual void  ls(const Option_t *Option="") const;
     virtual void  Paint(Option_t *Option="");
     virtual void  PaintHexagon(Float_t x, Float_t y, Float_t d);

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -172 +172 @@
     if (!fH->InheritsFrom("MH"))
     {
-        *fLog << dbginf << fH->GetName() << " [" << fH->ClassName();
-        *fLog << "] doesn't inherit from MH - cannot be used for MFillH... aborting." << endl;
+        *fLog << dbginf << fH->GetDescriptor() << " ";
+        *fLog << "doesn't inherit from MH - cannot be used for MFillH... aborting." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -25 +25 @@
 #include "MAnalysis.h"
 
-#include <stdlib.h>        // atof
 #include <iostream.h>
 
@@ -32 +31 @@
 #include <TGTextEntry.h>   // TGNumberEntry
 
+#include "MImgCleanStd.h"  // MImgCleanStd
+
 ClassImp(MAnalysis)
 
@@ -59 +60 @@
     TGCompositeFrame *frame = CreateNewTab("Setup");
 
+    TGGroupFrame *grp = new TGGroupFrame(frame, "Setup Display");
+    fList->Add(grp);
+
     //
     // Align the lines:
@@ -64 +68 @@
     //  - padding: top=20, bottom=0, left=20, right=0
     //
-    TGLayoutHints *layline = new TGLayoutHints(kLHintsNormal, 20, 0, 20);
-    fList->Add(layline);
+    TGLayoutHints *laybut = new TGLayoutHints(kLHintsNormal, 10, 10, 10);
+    fList->Add(laybut);
 
     //
     // Create check buttons for the first two lines
     //
-    fCheckButton1 = new TGCheckButton(frame, "Display Hillas Histograms when finished");  //, M_CHECK_DISPLHIL);
-    fCheckButton2 = new TGCheckButton(frame, "Display Star Map Histogram when finished"); //, M_CHECK_DISPLHIL);
+    fCheckButton1 = new TGCheckButton(grp, "Display Hillas Histograms when finished");  //, M_CHECK_DISPLHIL);
+    fCheckButton2 = new TGCheckButton(grp, "Display Star Map Histogram when finished"); //, M_CHECK_DISPLHIL);
+
+    fList->AddFirst(fCheckButton1);
+    fList->AddFirst(fCheckButton2);
+
+    //
+    // Create first two lines with the checkbuttons
+    //
+    grp->AddFrame(fCheckButton1, laybut);
+    grp->AddFrame(fCheckButton2, laybut);
+
+    TGLayoutHints *laygrp = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 20, 20, 20);
+    fList->Add(laygrp);
+
+    frame->AddFrame(grp, laygrp);
 
     /*
-     FIXME...
-
-     fList->Add(fCheckButton1);
-     fList->Add(fCheckButton2);
+     * Create GUI for image cleaning
      */
-
-    //
-    // Create first two lines with the checkbuttons
-    //
-    frame->AddFrame(fCheckButton1, layline);
-    frame->AddFrame(fCheckButton2, layline);
-
-    //
-    // Create entry fields and labels for line 3 and 4
-    //
-
-    /*
-     * --> use with root >=3.02 <--
-     *
-
-     TGNumberEntry *fNumEntry1 = new TGNumberEntry(frame, 3.0, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative);
-     TGNumberEntry *fNumEntry2 = new TGNumberEntry(frame, 2.5, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative);
-
-     */
-
-    //
-    // Create a frame for line 3 and 4 to be able
-    // to align entry field and label in one line
-    //
-    TGHorizontalFrame *f1 = new TGHorizontalFrame(frame, 0, 0);
-    TGHorizontalFrame *f2 = new TGHorizontalFrame(frame, 0, 0);
-
-    fNumEntry1 = new TGTextEntry(f1, "****");
-    fNumEntry2 = new TGTextEntry(f2, "****");
-
-    // --- doesn't work like expected --- fNumEntry1->SetAlignment(kTextRight);
-    // --- doesn't work like expected --- fNumEntry2->SetAlignment(kTextRight);
-
-    fNumEntry1->SetText("3.0");
-    fNumEntry2->SetText("2.5");
- 
-    fList->Add(fNumEntry1);
-    fList->Add(fNumEntry2);
-
-    TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1 for standard image cleaning.");
-    TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2 for standard image cleaning.");
-
-    l1->SetTextJustify(kTextLeft);
-    l2->SetTextJustify(kTextLeft);
-
-    fList->Add(l1);
-    fList->Add(l2);
-
-    //
-    // Align the text of the label centered, left in the row
-    // with a left padding of 10
-    //
-    TGLayoutHints *laylabel = new TGLayoutHints(kLHintsCenterY|kLHintsLeft, 10); //, 10); //, 5, 5);
-    fList->Add(laylabel);
-
-    //
-    // Add one entry field and the corresponding label to each line
-    //
-    f1->AddFrame(fNumEntry1);
-    f2->AddFrame(fNumEntry2);
-
-    f1->AddFrame(l1, laylabel);
-    f2->AddFrame(l2, laylabel);
-
-    //
-    // Add line 3 and 4 to tab
-    //
-    frame->AddFrame(f1, layline);
-    frame->AddFrame(f2, layline);
+    fImgClean = new MImgCleanStd;
+    fImgClean->CreateGui(frame, laygrp);
+    fList->Add(fImgClean);
 }
 
@@ -192 +141 @@
     const Bool_t displstarmap = fCheckButton2->GetState();
 
-    Float_t cleanlvl1 = atof(fNumEntry1->GetText());
-    Float_t cleanlvl2 = atof(fNumEntry2->GetText());
-
-    if (cleanlvl1<0)
-    {
-        cleanlvl1=0;
-        fNumEntry1->SetText("0");
-    }
-
-    if (cleanlvl2<0)
-    {
-        cleanlvl2=0;
-        fNumEntry2->SetText("0");
-    }
-
     //
     // Create a empty Parameter List and an empty Task List
@@ -245 +179 @@
 
     MCerPhotCalc ncalc;
-    MImgCleanStd clean(cleanlvl1, cleanlvl2);
     MHillasCalc  hcalc;
 
     tlist.AddToList(&read);
     tlist.AddToList(&ncalc);
-    tlist.AddToList(&clean);
+    tlist.AddToList(fImgClean);
     tlist.AddToList(&hcalc);
 

trunk/MagicSoft/Mars/mmain/MAnalysis.h

@@ -9 +9 @@
 class TGCheckButton;
 
+class MImgCleanStd;
+
 class MAnalysis : public MBrowser
 {
@@ -15 +17 @@
     TGCheckButton *fCheckButton2;
 
-    TGTextEntry   *fNumEntry1;
-    TGTextEntry   *fNumEntry2;
+//    TGTextEntry   *fNumEntry1;
+//    TGTextEntry   *fNumEntry2;
+
+    MImgCleanStd  *fImgClean;
 
     void CalculateHillas();

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -59 +59 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
 #include "MArrayS.h"
 #include "MArrayB.h"
@@ -286 +288 @@
     }
 
-    *fLog << "MRawEvtData::Draw: Warning: You must specify either 'GRAPH' or 'HIST'" << endl;
+    *fLog << dbginf << "Warning - You must specify either 'GRAPH' or 'HIST'" << endl;
 }
 
@@ -296 +298 @@
 void MRawEvtData::DeletePixels(Bool_t flag)
 {
-    const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
-
-    if (fArraySize == npix && flag)
-    {
-        fPosInArray = 0;
-        return;
+    if (fRunHeader && flag)
+    {
+        const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();
+
+        if (fArraySize == npix)
+        {
+            fPosInArray = 0;
+            return;
+        }
     }
 
@@ -327 +332 @@
 void MRawEvtData::InitArrays(Bool_t flag)
 {
-    if (flag)
+    if (flag && fRunHeader)
     {
         const int npix = fRunHeader->GetNumCrates()*fRunHeader->GetNumPixInCrate();