Changeset 1102 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

12/10/01 15:26:24 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

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

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -25 +25 @@
 #include "MGCamDisplay.h"
 
-#include <TList.h>          // TList::Add
-#include <TCanvas.h>        // TCanvas::cd
-#include <TGButton.h>       // TGPictureButton
-#include <TGButtonGroup.h>  // TGVButtonGroup
-
-#include "MGTask.h"         // MGTask::CreateGui
-#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
+#include <TList.h>            // TList::Add
+#include <TCanvas.h>          // TCanvas::cd
+#include <TGButton.h>         // TGPictureButton
+#include <TGButtonGroup.h>    // TGVButtonGroup
+
+#include "MGTask.h"           // MGTask::CreateGui
+#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 "MMcPedestalCopy.h"  // MMcPedestalCopy
+#include "MMcPedestalNSB.h"   // MMcPedestalNSB
+#include "MImgCleanStd.h"     // MImgCleanStd
+#include "MGeomCamMagic.h"    // MGeomMagicCam
 
 ClassImp(MGCamDisplay);
@@ -79 +81 @@
      Bacause of some strage and hidden dependencies the
      GetMaiFrame call in the destructor of TGButton may fail if some
-     of the other gui elemts is deleted first.
+     of the other gui elements are deleted first.
      AddFirst adds the buttons at the beginning of the deletion list,
      this seems to work.
@@ -113 +115 @@
     MParList  *plist = GetParList();
 
-    MCerPhotCalc *ncalc = new MCerPhotCalc;
-    MClone       *clone = new MClone("MCerPhotEvt");
-    MImgCleanStd *clean = new MImgCleanStd;
-    MHillasCalc  *hcalc = new MHillasCalc;
-
+    MMcPedestalCopy *pcopy = new MMcPedestalCopy;
+    MMcPedestalNSB  *pdnsb = new MMcPedestalNSB;
+    MCerPhotCalc    *ncalc = new MCerPhotCalc;
+    MClone          *clone = new MClone("MCerPhotEvt");
+    MImgCleanStd    *clean = new MImgCleanStd;
+    MHillasCalc     *hcalc = new MHillasCalc;
+
+    tlist->AddToList(pcopy);
+    tlist->AddToList(pdnsb);
     tlist->AddToList(ncalc);
     tlist->AddToList(clone);

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -43 +43 @@
 #include "MTaskList.h"
 #include "MEvtLoop.h"
-#include "MReadTree.h"
+#include "MReadMarsFile.h"
 
 ClassImp(MGEvtDisplay);
@@ -87 +87 @@
 MReadTree *MGEvtDisplay::GetReader() const
 {
-    return (MReadTree*)GetTaskList()->FindObject("MReadTree");
+    return (MReadTree*)GetTaskList()->FindObject("MReadMarsFile");
 }
 
@@ -380 +380 @@
     tlist->SetOwner();
 
-    MReadTree *read = new MReadTree(tname, fname);
+    MReadMarsFile *read = new MReadMarsFile(tname, fname);
     tlist->AddToList(read);