Changeset 2479 for trunk/MagicSoft/Mars/mmain

Timestamp:

11/07/03 13:17:07 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MCameraDisplay.cc (modified) (2 diffs)
• MEventDisplay.cc (added)
• MEventDisplay.h (added)
• MMars.cc (modified) (3 diffs)
• MainLinkDef.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc

@@ -29 +29 @@
 
 #include "MGList.h"
-#include "MGCamDisplay.h"
+#include "MEventDisplay.h"
 
 ClassImp(MCameraDisplay)
@@ -90 +90 @@
         {
         case kButDisplay:
-            new MGCamDisplay(fInputFile,
-                             fClient->GetRoot(), /*this,*/ 600, 500);
+            new MEventDisplay(fInputFile);
             return kTRUE;
         }

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -55 +55 @@
     kPicMars,
 
-    kButEvtDisplay,
+    //kButEvtDisplay,
     kButDataCheck,
     kButAnalysis,
@@ -170 +170 @@
     fList->Add(tab);
 
-    CreateTextButton(tab, "Event Display",  "Histograms: Pix per Event",
-                     kButEvtDisplay);
+//    CreateTextButton(tab, "Event Display",  "Histograms: Pix per Event",
+//                     kButEvtDisplay);
     CreateTextButton(tab, "Data Check",     "Histograms: Pix per Run",
                      kButDataCheck);
@@ -277 +277 @@
             switch (parm1)
             {
-
+/*
             case kButEvtDisplay:
-                new MEvtDisp(/*this*/);
-                return kTRUE;
-
+                new MEvtDisp();
+                return kTRUE;
+*/
             case kButDataCheck:
                 new MDataCheck(/*this*/);

trunk/MagicSoft/Mars/mmain/MainLinkDef.h

@@ -8 +8 @@
 
 #pragma link C++ class MMars+;
-#pragma link C++ class MEvtDisp+;
+//#pragma link C++ class MEvtDisp+;
 #pragma link C++ class MAnalysis+;
 //#pragma link C++ class MTextEntry+;
@@ -16 +16 @@
 #pragma link C++ class MProgressBar+;
 #pragma link C++ class MCameraDisplay+;
+#pragma link C++ class MEventDisplay+;
 #pragma link C++ class MStatusDisplay+;