Changeset 2381 for trunk/MagicSoft

Timestamp:

10/04/03 19:51:50 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

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

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -38 +38 @@
 #include "MTaskList.h"           // MTaskList::AddToList
 #include "MHCamera.h"            // MHCamera
-#include "MGeomApply.h"          // MGeomApply
 #include "MHillasCalc.h"         // MHillasCalc
 #include "MHillasSrcCalc.h"      // MHillasSrcCalc
@@ -49 +48 @@
 #include "MBlindPixelCalc.h"     // MBlindPixelCalc
 #include "MImgCleanStd.h"        // MImgCleanStd
-//#include "MGeomCamMagic.h"       // MGeomMagicCam
 #include "MRawEvtData.h"         // MRawEvtData
 
@@ -117 +115 @@
 //  preprocess tasks and read in first event (process)
 //
-void /*MGeomCam */MGCamDisplay::SetupTaskList()
+void MGCamDisplay::SetupTaskList()
 {
     MTaskList *tlist = GetTaskList();
     MParList  *plist = GetParList();
 
-    MGeomApply        *apply = new MGeomApply;
     MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
     MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
@@ -132 +129 @@
     MHillasSrcCalc    *scalc = new MHillasSrcCalc;
 
-    tlist->AddToList(apply);
     tlist->AddToList(pcopy);
     tlist->AddToList(pdnsb);
@@ -142 +138 @@
     tlist->AddToList(scalc);
 
-    // MGeomCamMagic *geom   = new MGeomCamMagic;
     MPedestalCam  *pedest = new MPedestalCam;
     MRawEvtData   *event  = new MRawEvtData;
@@ -164 +159 @@
     // Setup Task list for hillas calculation
     //
-    /*MGeomCam *geom = */SetupTaskList();
+    SetupTaskList();
 
     //
@@ -224 +219 @@
 //  together with the hillas ellipse or not.
 //
-#include <iostream.h>
 void MGCamDisplay::UpdateDisplay()
 {
@@ -236 +230 @@
         MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
         for (int i=0; i<5; i++)
-        {
             fDisplay[i]->SetGeometry(*cam);
-            cout << "---> Setting geometry for: " << fDisplay[i]->GetName() << endl;
-        }
     }
 

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h

@@ -20 +20 @@
 
     MHCamera *fDisplay[5];
-    TCanvas     *fCanvas2[5];
+    TCanvas  *fCanvas2[5];
 
     void AddSetupElements();
     void UpdateDisplay();
 
-    void /*MGeomCam */SetupTaskList();
+    void SetupTaskList();
 
 public:

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -43 +43 @@
 #include "MLogManip.h"
 
+#include "MHCamera.h"
 #include "MParList.h"
 #include "MTaskList.h"
 #include "MEvtLoop.h"
 #include "MHCamera.h"
-#include "MReadMarsFile.h"
-#include "MGeomCamMagic.h"
+#include "MGeomApply.h"
 #include "MRawEvtData.h"
 #include "MRawEvtHeader.h"
+#include "MReadMarsFile.h"
 
 #include "MMcEvt.hxx"
@@ -276 +277 @@
 
     fCanvas=AddTab("Photons");
-
-    AddTab("Geometry");
-
-    MGeomCamMagic geom;
-    MHCamera *display = new MHCamera(geom);
-    display->SetBit(TH1::kNoStats);
-    display->Draw();
-    display->DrawPixelIndices();
-    fList->Add(display);
 
     //
@@ -422 +414 @@
                            UInt_t w, UInt_t h)
 //    : TGTransientFrame(p, main, w, h), fInitOk(kFALSE)
-: TGMainFrame(p, w, h), fInitOk(kFALSE)
+: TGMainFrame(p, w, h), fInitOk(kFALSE), fGeom(NULL)
 {
     //
@@ -441 +433 @@
     read->DisableAutoScheme();
     tlist->AddToList(read);
+
+    MGeomApply *apl = new MGeomApply;
+    tlist->AddToList(apl);
 
     MParList *plist = new MParList;
@@ -536 +531 @@
 // --------------------------------------------------------------------------
 //
+//  Adds the geometry tab 
+//
+void MGEvtDisplay::AddGeometryTab()
+{
+    MGeomCam *geom = (MGeomCam*)GetParList()->FindObject("MGeomCam");
+    if (!geom)
+        return;
+
+    fGeom=AddTab("Geometry");
+
+    MHCamera *cam = new MHCamera(*geom);
+    cam->SetBit(TH1::kNoStats);
+    cam->Draw();
+    cam->DrawPixelIndices();
+    fList->Add(cam);
+
+    fGeom->Modified();
+    fGeom->Update();
+}
+
+// --------------------------------------------------------------------------
+//
 //  Checks if the event number is valid, and if so reads the new event
 //  and updates the display
@@ -541 +558 @@
 void MGEvtDisplay::ReadinEvent(Int_t dir)
 {
+    if (!fGeom)
+        AddGeometryTab();
+
     MRawEvtData *raw = (MRawEvtData*)GetParList()->FindObject("MRawEvtData");
-
     if (!raw)
         return;

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -42 +42 @@
 
     void AddFrames(const char *filename, const char *treename);
+    void AddGeometryTab();
 
     void SaveAsDialog() const;
@@ -53 +54 @@
 
     TCanvas   *fCanvas;
+    TCanvas   *fGeom;
 
     TGCompositeFrame *fTab1;