Changeset 2161 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

06/05/03 10:18:20 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (4 diffs)
• MGEvtDisplay.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -38 +38 @@
 #include "MCamDisplay.h"         // MCamDisplay
 #include "MHillasCalc.h"         // MHillasCalc
+#include "MHillasSrcCalc.h"      // MHillasSrcCalc
 #include "MPedestalCam.h"        // MPedestalCam
 #include "MCerPhotCalc.h"        // MCerPhotCalc
@@ -123 +124 @@
     MBlindPixelCalc   *blind = new MBlindPixelCalc;
     MHillasCalc       *hcalc = new MHillasCalc;
+    MHillasSrcCalc    *scalc = new MHillasSrcCalc;
 
     tlist->AddToList(pcopy);
@@ -131 +133 @@
     tlist->AddToList(blind);
     tlist->AddToList(hcalc);
+    tlist->AddToList(scalc);
 
     MGeomCamMagic *geom   = new MGeomCamMagic;
@@ -210 +213 @@
     MHillas *hillas = (MHillas*)plist->FindObject("MHillas");
 
+    hillas->Print();
     plist->FindObject("MHillasExt")->Print();
+    plist->FindObject("MHillasSrc")->Print();
     plist->FindObject("MNewImagePar")->Print();
 
-    hillas->Print();
     if (fDisplayHillas)
     {

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz, 10/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -39 +39 @@
 #include <TG3DLine.h>             // TGHorizontal3DLine
                                   // use TGSplitter instead for root<3.00
+
+#include "MLog.h"
+#include "MLogManip.h"
 
 #include "MParList.h"
@@ -516 +519 @@
     fEvtInfo->SetText(txt);
 
+    gLog << all;
+    gLog.Separator(txt);
+
     //
     // Seems to be necessary to newly layout the upper part to display
@@ -535 +541 @@
     {
         GetReader()->DecEventNum();
+        UpdateMcLabel();
         UpdateDisplay();
-        UpdateMcLabel();
     }