Changeset 1540 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

10/15/02 17:02:46 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (6 diffs)
• MGCamDisplay.h (modified) (1 diff)
• MGEvtDisplay.cc (modified) (5 diffs)
• MGEvtDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -32 +32 @@
 #include "MGTask.h"              // MGTask::CreateGui
 #include "MClone.h"              // MClone
-#include "MHillas.h"             // MHillas
+#include "MHillasExt.h"          // MHillasExt
 #include "MParList.h"            // MParList::AddToList
 #include "MEvtLoop.h"            // MEvtLoop::GetParList
@@ -81 +81 @@
      WARNING:
      Bacause of some strage and hidden dependencies the
-     GetMaiFrame call in the destructor of TGButton may fail if some
+     GetMainFrame call in the destructor of TGButton may fail if some
      of the other gui elements are deleted first.
      AddFirst adds the buttons at the beginning of the deletion list,
@@ -134 +134 @@
     MGeomCamMagic *geom   = new MGeomCamMagic;
     MPedestalCam  *pedest = new MPedestalCam;
+    MHillasExt    *hext   = new MHillasExt;
 
     plist->AddToList(geom);
     plist->AddToList(pedest);
+    plist->AddToList(hext);
 
     return geom;
@@ -160 +162 @@
     AddSetupElements();
 
+    TCanvas *canv2 = AddTab("Errors");
+    TCanvas *canv3 = AddTab("Phot/Err");
+    TCanvas *canv4 = AddTab("Levels");
+    TCanvas *canv5 = AddTab("Pedestals");
+
     //
     // Show camera display for the actual geometry
     //
+    fDisplay  = new MCamDisplay(geom);
+    fDisplay2 = new MCamDisplay(geom);
+    fDisplay3 = new MCamDisplay(geom);
+    fDisplay4 = new MCamDisplay(geom);
+    fDisplay5 = new MCamDisplay(geom);
+
+    fList->Add(fDisplay);
+    fList->Add(fDisplay2);
+    fList->Add(fDisplay3);
+    fList->Add(fDisplay4);
+    fList->Add(fDisplay5);
+
     fCanvas->cd();
-    fDisplay = new MCamDisplay(geom);
     fDisplay->Draw();
-    fList->Add(fDisplay);
+    canv2->cd();
+    fDisplay2->Draw();
+    canv3->cd();
+    fDisplay3->Draw();
+    canv4->cd();
+    fDisplay4->Draw();
+    canv5->cd();
+    fDisplay5->Draw();
+
 
     ReadFirstEvent();
@@ -213 +239 @@
     // Display the requested event. This does a Canvas update, too.
     //
-    MCerPhotEvt *evt = NULL;
+    MCerPhotEvt  *evt = NULL;
     if (fDisplayRaw)
     {
@@ -230 +256 @@
     }
 
+    const MImgCleanStd *clean = (MImgCleanStd*)GetTaskList()->FindObject("MImgCleanStd");
+    const MPedestalCam *ped   = (MPedestalCam*)plist->FindObject("MPedestalCam");
+
     fDisplay->DrawPhotNum(evt);
+    fDisplay2->DrawErrorPhot(evt);
+    fDisplay3->DrawRatio(evt);
+    fDisplay4->DrawLevels(evt, *clean);
+    fDisplay5->DrawPedestals(ped);
 }
 

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h

@@ -18 +18 @@
 
     TGListBox   *fPixelList;
+
     MCamDisplay *fDisplay;
+    MCamDisplay *fDisplay2;
+    MCamDisplay *fDisplay3;
+    MCamDisplay *fDisplay4;
+    MCamDisplay *fDisplay5;
 
     void AddSetupElements();

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -208 +208 @@
 // --------------------------------------------------------------------------
 //
+//  Add a tab with an embedded canvas for an camera display and return the
+//  pointer to the canvas
+//
+TCanvas *MGEvtDisplay::AddTab(TString name)
+{
+    TGLayoutHints *laycanvas = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY|kLHintsExpandX|kLHintsExpandY);
+    fList->Add(laycanvas);
+
+    TGCompositeFrame *frame = fEvtDisplay->AddTab(name);
+    TRootEmbeddedCanvas *canvas = new TRootEmbeddedCanvas(name+"Display", frame, 400, 400);
+    frame->AddFrame(canvas, laycanvas);
+    fList->Add(canvas);
+    return canvas->GetCanvas();
+}
+
+// --------------------------------------------------------------------------
+//
 //  Add the mid frame: This are the two tabs with the canvas in the right one
 //
@@ -230 +247 @@
     //
     // Create second part of frame
-    // 
-    TGTab *tabdisp = new TGTab(frame, 300, 300);
-
-    TGLayoutHints *laycanvas = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY|kLHintsExpandX|kLHintsExpandY);
-
-    TGCompositeFrame *tab2 = tabdisp->AddTab("Event Display");
-    TRootEmbeddedCanvas *canvas = new TRootEmbeddedCanvas("EventDisplay", tab2, 400, 400);
-    tab2->AddFrame(canvas, laycanvas);
-    fList->Add(canvas);
-
-    fCanvas = canvas->GetCanvas();
-
-    TGCompositeFrame *tab3 = tabdisp->AddTab("Geometry");
-    canvas = new TRootEmbeddedCanvas("CamDisplay", tab3, 400, 400);
-    tab3->AddFrame(canvas, laycanvas);
-    fList->Add(canvas);
-
+    //
+    fEvtDisplay = new TGTab(frame, 300, 300);
+
+    fCanvas=AddTab("Photons");
+
+    AddTab("Geometry");
     MGeomCamMagic geom;
     MCamDisplay *display = new MCamDisplay(&geom);
@@ -257 +263 @@
     //
     TGLayoutHints *laydisp = new TGLayoutHints(kLHintsNormal|kLHintsExpandY|kLHintsExpandX, 10, 10, 10, 10);
-    frame->AddFrame(tabdisp, laydisp);
+    frame->AddFrame(fEvtDisplay, laydisp);
 
     //
     // Now add all gui elements to 'autodel'-list
     //
-    fList->Add(tabdisp);
-    fList->Add(laycanvas);
+    fList->Add(fEvtDisplay);
     fList->Add(laydisp);
     fList->Add(laytabs);
@@ -475 +480 @@
     txt += "m  ZA=";
     txt += (int)(evt->GetTheta()*180/TMath::Pi()+.5);
-    txt += "°     ";
+    txt += "°  ";
+    txt += evt->GetPhotElfromShower();
+    txt += "PhEl";
 
     fEvtInfo->SetText(txt);
@@ -640 +647 @@
     return kTRUE;
 }
+

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -10 +10 @@
 #endif
 
+class TGTab;
 class TList;
 class TCanvas;
@@ -29 +30 @@
     TGLabel     *fEvtInfo;
     TGTextEntry *fTxtEvtNr;
+
+    TGTab       *fEvtDisplay;
 
     void AddMenuBar();
@@ -60 +63 @@
     MReadTree *GetReader() const;
 
+    TCanvas *AddTab(TString name);
+
     void   ReadFirstEvent();
     Bool_t IsInitOk() { return fInitOk; }