Changeset 961 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

10/05/01 14:39:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (2 diffs)
• MGCamDisplay.h (modified) (1 diff)
• MGEvtDisplay.cc (modified) (1 diff)
• MGEvtDisplay.h (modified) (1 diff)
• MGFadcDisp.cc (modified) (8 diffs)
• MGFadcDisp.h (modified) (2 diffs)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -25 +25 @@
 #include "MGCamDisplay.h"
 
-#include <TList.h>                // TList
-#include <TGButton.h>             // TGPictureButton
-#include <TGButtonGroup.h>
-
-#include "MClone.h"
-#include "MHillas.h"
-#include "MEvtLoop.h"
-#include "MParList.h"
-#include "MTaskList.h"
-#include "MReadTree.h"
-#include "MCamDisplay.h"
-#include "MHillasCalc.h"
-#include "MPedestalCam.h"
-#include "MCerPhotCalc.h"
-#include "MImgCleanStd.h"
-#include "MGeomCamMagic.h"
+#include <TList.h>          // TList::Add
+#include <TCanvas.h>        // TCanvas::cd
+#include <TGButton.h>       // TGPictureButton
+#include <TGButtonGroup.h>  // TGVButtonGroup
+
+#include "MClone.h"         // MClone
+#include "MHillas.h"        // MHillas
+#include "MParList.h"       // MParList::AddToList
+#include "MEvtLoop.h"       // MEvtLoop::GetParList
+#include "MTaskList.h"      // MTaskList::AddToList
+#include "MCamDisplay.h"    // MCamDisplay
+#include "MHillasCalc.h"    // MHillasCalc
+#include "MPedestalCam.h"   // MPedestalCam
+#include "MCerPhotCalc.h"   // MCerPhotCalc
+#include "MImgCleanStd.h"   // MImgCleanStd
+#include "MGeomCamMagic.h"  // MGeomMagicCam
 
 ClassImp(MGCamDisplay);
@@ -189 +189 @@
     hillas->Print();
     if (fDisplayHillas)
+    {
+        fCanvas->cd();
         hillas->Draw();
+    }
     else
         hillas->Clear();

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h

@@ -36 +36 @@
     Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-    ClassDef(MGCamDisplay, 0)
+    ClassDef(MGCamDisplay, 0) // Display for camera images (cerenkov events)
 };
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -481 +481 @@
     case kC_TEXTENTRY:
         if (GET_SUBMSG(msg) == kTE_ENTER)
-            ReadinEvent(atoi(fTxtEvtNr->GetText()));
+            ReadinEvent(atoi(fTxtEvtNr->GetText())-1);
         return kTRUE;
     }

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -71 +71 @@
     virtual Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-    ClassDef(MGEvtDisplay, 0)
+    ClassDef(MGEvtDisplay, 0) // base class to display something event by event
 };
 

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -54 +54 @@
 {
     M_PREVPIXEL = 0x1000,
-    M_NEXTPIXEL = 0x1001
+    M_NEXTPIXEL = 0x1001,
+
+    M_PIXELLIST = 0x1002
 };
 
@@ -127 +129 @@
 
     //
-    //   Map the window, set up the layout, etc.
-    //
-    SetWMSizeHints(450, 400, 1000, 1000, 10, 10 );      // set the smallest and biggest size of the Main frame
-
+    // set the smallest and biggest size of the Main frame
+    //
+    SetWMSizeHints(450, 400, 1000, 1000, 10, 10);
+
+    //
+    // Map the window, set up the layout, etc.
+    //
     MapSubwindows();
 
@@ -160 +165 @@
 //   the list of pixels in the fPixelList (TGListBox)
 //
-void MGFadcDisp::CreatePixelList(Int_t lastsel)
+void MGFadcDisp::DisplayPixel(Int_t lastsel, Bool_t update)
 {
     MRawEvtData *data = GetEvent();
 
-    //
-    //   put the selection of the last event in memory
-    //
     MRawEvtPixelIter pixel(data);
-    while (pixel.Next())
+
+    if (update)
     {
-        char txt[100];
-        sprintf(txt, "%d", pixel.GetPixelId());
-        fPixelList->AddEntry(txt, pixel.GetPixelId());
+        //
+        //   put the selection of the last event in memory
+        //
+        while (pixel.Next())
+        {
+            char txt[100];
+            sprintf(txt, "%d", pixel.GetPixelId());
+            fPixelList->AddEntry(txt, pixel.GetPixelId());
+        }
+
+        fPixelList->MapSubwindows();
+        fPixelList->Layout();
     }
-
-    fPixelList->MapSubwindows();
-    fPixelList->Layout();
 
     //
@@ -187 +196 @@
     {
         pixel.Reset();
-        lastsel=pixel.GetPixelId();
+        lastsel=0; //pixel.GetPixelId();
     }
 
@@ -194 +203 @@
     data->Draw(txt);
     fPixelList->Select(lastsel, kTRUE);
+    fPixelList->SetTopEntry(lastsel);
 
     fCanvas->Modified();
@@ -209 +219 @@
     fPixelList->RemoveEntries(0, GetEvent()->GetNumPixels());
 
-    CreatePixelList(lastsel);
-}
-
-// --------------------------------------------------------------------------
-//
-//  Display another pixel
-//
-void MGFadcDisp::DisplayPix(UInt_t i)
-{
-    MRawEvtData *data = GetEvent();
-
-    fCanvas->Clear();
-    fCanvas->cd();
-
-    char txt[256];
-    sprintf(txt, "GRAPH%d", i);
-    data->Draw(txt);
-
-    fCanvas->Modified();
-    fCanvas->Update();
-
-    //
-    // FIXME: too complicated!
-    //
-    fPixelList->RemoveEntries(0, data->GetNumPixels());
-    CreatePixelList(i);
+    DisplayPixel(lastsel);
 }
 
@@ -257 +242 @@
             {
             case M_PREVPIXEL:
-                DisplayPix(fPixelList->GetSelected()-1);
+                DisplayPixel(fPixelList->GetSelected()-1, kFALSE);
                 return kTRUE;
 
             case M_NEXTPIXEL:
-                DisplayPix(fPixelList->GetSelected()+1);
+                DisplayPixel(fPixelList->GetSelected()+1, kFALSE);
                 return kTRUE;
             }
@@ -270 +255 @@
                 break;
 
-            DisplayPix(fPixelList->GetSelected());
+            DisplayPixel(fPixelList->GetSelected(), kFALSE);
             return kTRUE;
         }

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.h

@@ -19 +19 @@
 
     void AddSetupElements();
-    void DisplayPix(UInt_t i);
     void UpdateDisplay();
-    void CreatePixelList(Int_t lastsel=-1);
+    void DisplayPixel(Int_t lastsel=-1, Bool_t update=kTRUE);
 
     MRawEvtData *GetEvent() const;
@@ -32 +31 @@
     virtual Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-    ClassDef(MGFadcDisp, 0)
+    ClassDef(MGFadcDisp, 0) // Display for single pixel fadc data
 };