Changeset 1385 for trunk/MagicSoft/Mars

Timestamp:

07/08/02 11:44:34 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• meventdisp/MGEvtDisplay.cc (modified) (5 diffs)
• meventdisp/MGEvtDisplay.h (modified) (2 diffs)
• meventdisp/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
      - cd to right canvas before drawing camera display
 
-   * meventdisp/MGEvtDisplay.cc:
+   * meventdisp/MGEvtDisplay.[h,cc]:
      - added the "Geometry"-Tab
+     - added MC informations to gui
 
    * mgui/MCamDisplay.[h,cc]:

trunk/MagicSoft/Mars/NEWS

@@ -25 +25 @@
    - Added a camera display displaying the pixel numbers to the
      event display gui.
+
+   - Added Monte Carlo Informations to event display gui
 
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -47 +47 @@
 #include "MGeomCamMagic.h"
 
+#include "MMcEvt.hxx"
+
 ClassImp(MGEvtDisplay);
 
@@ -131 +133 @@
 
     //
-    // layout and add frame
+    //  --- the top1 part of the window ---
+    //
+    TGHorizontalFrame *top2 = new TGHorizontalFrame(frame, 300, 100);
+    fList->Add(top2);
+
+    fEvtInfo = new TGLabel(top2, new TGString(""));
+    fList->Add(fEvtInfo);
+
+    top2->AddFrame(fEvtInfo, laystd);
+
+    //
+    // layout and add frames
     //
     TGLayoutHints *laytop1 = new TGLayoutHints(kLHintsTop);
     fList->Add(laytop1);
-
     frame->AddFrame(top1, laytop1);
+    frame->AddFrame(top2, laytop1);
 }
 
@@ -393 +406 @@
 
     MReadMarsFile *read = new MReadMarsFile(tname, fname);
+    read->DisableAutoScheme();
     tlist->AddToList(read);
 
@@ -430 +444 @@
 {
     delete this;
+}
+
+void MGEvtDisplay::UpdateMcLabel()
+{
+    MMcEvt *evt=(MMcEvt*)GetParList()->FindObject("MMcEvt");
+    if (!evt)
+        return;
+
+    TString txt = " ";
+
+    switch (evt->GetPartId())
+    {
+    case kGAMMA:
+        txt += "Gamma";
+        break;
+    case kPROTON:
+        txt += "Proton";
+        break;
+    case kHELIUM:
+        txt += "Helium";
+        break;
+    default:
+        txt += "Unknown Particle Id";
+    }
+
+    txt += ":  E=";
+    txt += (int)(evt->GetEnergy()+.5);
+    txt += "GeV  r=";
+    txt += (int)(evt->GetImpact()/100+.5);
+    txt += "m  ZA=";
+    txt += (int)(evt->GetTheta()*180/TMath::Pi()+.5);
+    txt += "°     ";
+
+    fEvtInfo->SetText(txt);
 }
 
@@ -443 +491 @@
         GetReader()->DecEventNum();
         UpdateDisplay();
+        UpdateMcLabel();
     }
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -27 +27 @@
     //
     TGLabel     *fNumOfEvts;
+    TGLabel     *fEvtInfo;
     TGTextEntry *fTxtEvtNr;
 
@@ -62 +63 @@
     Bool_t IsInitOk() { return fInitOk; }
 
+    void UpdateMcLabel();
+
     virtual void UpdateDisplay() = 0;
 

trunk/MagicSoft/Mars/meventdisp/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../mgui -I../manalysis -I../mfileio
+INCLUDES = -I. -I../mbase -I../mraw -I../mgui \
+           -I../manalysis -I../mfileio -I../mmc
 
 #------------------------------------------------------------------------------