Changeset 959 for trunk/MagicSoft/Mars/mmain

Timestamp:

10/02/01 14:46:56 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MCameraDisplay.cc (added)
• MCameraDisplay.h (added)
• MDataCheck.cc (modified) (4 diffs)
• MDataCheck.h (modified) (1 diff)
• MMars.cc (modified) (6 diffs)
• MMars.h (modified) (2 diffs)
• MainLinkDef.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -28 +28 @@
 #include <TGButton.h>  // TGTextButton
 
+// ---
+
+#include "MParList.h"
+#include "MTaskList.h"
+#include "MEvtLoop.h"
+#include "MReadTree.h"
+#include "MFillH.h"
+#include "MGDisplayAdc.h"
+
+// ---
+
 ClassImp(MDataCheck)
 
@@ -37 +48 @@
 };
 
+// --------------------------------------------------------------------------
+//
+//  Create the 'Data Check' GUI Controls (Window) on the screen. To use it
+//  from within the interpreter you can call a Standard Version with
+//  'new MDataCheck()'
+//
 MDataCheck::MDataCheck(const TGWindow *main, const TGWindow *p,
-                                 const UInt_t w, const UInt_t h)
+                       const UInt_t w, const UInt_t h)
 : MBrowser(main, p, w, h)
 {
@@ -75 +92 @@
 }
 
-// ======================================================================
+// --------------------------------------------------------------------------
+//
+//  Create the 'View Adc' GUI Controls (Window) on the screen.
+//  Therefor we have to process all data in a file and fill the corresponding
+//  histograms.
+//
+void MDataCheck::ViewAdcSpectra(Char_t *inputfile, Char_t *treeName)
+{
+    //
+    // create a (empty) list of parameters which can be used by the tasks
+    // and an (empty) list of tasks which should be executed
+    // connect them in the required way.
+    //
 
+    //
+    //   create the data containers for the raw data
+    //
+    MParList plist;
+
+    //
+    // set up the tasks for this job
+    //
+    MTaskList tasks;
+    plist.AddToList(&tasks);
+
+    MReadTree readin(treeName, inputfile);
+    tasks.AddToList(&readin);
+
+    MFillH fillspect("MRawEvtData", "MHFadcCam");
+    tasks.AddToList(&fillspect);
+
+    //
+    // set up the loop for the processing
+    //
+    MEvtLoop magic;
+    magic.SetParList(&plist);
+
+    //
+    // start the loop running
+    //
+    if (!magic.Eventloop())
+        return;
+
+    new MGDisplayAdc((MHFadcCam*)plist.FindObject("MHFadcCam"));
+}
+
+// --------------------------------------------------------------------------
+//
+//  Process the GUI control events (here: mainly button clicks)
+//
 Bool_t MDataCheck::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
 {
@@ -99 +164 @@
         {
         case M_BUTTON_PEDADC:
-            fViewAdc.AdcSpectra(fInputFile, "PedEvents");
+            ViewAdcSpectra(fInputFile, "PedEvents");
             return kTRUE;
 
         case M_BUTTON_CRADC:
-            fViewAdc.AdcSpectra(fInputFile, "Events");
+            ViewAdcSpectra(fInputFile, "Events");
             return kTRUE;
 

trunk/MagicSoft/Mars/mmain/MDataCheck.h

@@ -10 +10 @@
 #endif
 
-#ifndef MVIEWADCSPECTRA_H
-#include "MViewAdcSpectra.h"
-#endif
-
 class MDataCheck : public MBrowser
 {
 private:
-    MViewAdcSpectra fViewAdc;
+    void ViewAdcSpectra(Char_t *inputfile, Char_t *treeName);
 
 public:

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -34 +34 @@
 #include <TG3DLine.h>      // TGHorizontal3DLine
                            // use TGSplitter.h for root<3.00
-
 #include "MEvtDisp.h"
 #include "MAnalysis.h"
 #include "MDataCheck.h"
 #include "MMonteCarlo.h"
-
-#include "MGPrototyp.h"
+#include "MCameraDisplay.h"
 
 ClassImp(MMars)
 
 enum {
-  M_FILE_EXIT,
-  M_FILE_ABOUT,
-
-  M_PICTURE_MAGIC,
-  M_PICTURE_MARS,
-
-  M_BUTTON_EVTDISP,
-  M_BUTTON_DATACHECK,
-  M_BUTTON_ANALYSE,
-  M_BUTTON_MONTECARLO
+    M_FILE_EXIT,
+    M_FILE_ABOUT,
+
+    M_PICTURE_MAGIC,
+    M_PICTURE_MARS,
+
+    M_BUTTON_EVTDISP,
+    M_BUTTON_DATACHECK,
+    M_BUTTON_ANALYSE,
+    M_BUTTON_MONTECARLO,
+    M_BUTTON_CAMDISPLAY
 };
 
@@ -97 +96 @@
     mars->Associate(this);
 
-    TGLayoutHints *lay1 = new TGLayoutHints(kLHintsLeft, 10., 10., 20., 10.);
-    TGLayoutHints *lay2 = new TGLayoutHints(kLHintsLeft, 10., 10., 10., 10.);
+    TGLayoutHints *lay1 = new TGLayoutHints(kLHintsLeft,  10., 10., 20., 10.);
+    TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10., 10., 10., 10.);
 
     fList->Add(lay1);
@@ -105 +104 @@
     top->AddFrame(magic, lay1);
     top->AddFrame(mars,  lay2);
+}
+
+void MMars::CreateTextButton(TGVerticalFrame *tab, const char *text,
+                             const UInt_t id, TGLayoutHints *hints) const
+{
+    //
+    // Create the button
+    //
+    TGTextButton *button = new TGTextButton(tab, text, id);
+
+    //
+    // Add button for 'auto-delete'
+    //
+    fList->Add(button);
+
+    //
+    // Send button events (meesages) to this object (s. ProcessMessage)
+    //
+    button->Associate(this);
+
+    //
+    // Add button with corresponding layout to containing frame
+    //
+    tab->AddFrame(button, hints);
 }
 
@@ -136 +159 @@
     tf->AddFrame(tab2, laytabx);
 
-    TGTextButton *evtdisp    = new TGTextButton(tab2, "EventDisplay", M_BUTTON_EVTDISP);
-    TGTextButton *datacheck  = new TGTextButton(tab2, "Data Check",   M_BUTTON_DATACHECK);
-    TGTextButton *analysis   = new TGTextButton(tab2, "Analysis",     M_BUTTON_ANALYSE);
-    TGTextButton *montecarlo = new TGTextButton(tab2, "MonteCarlo",   M_BUTTON_MONTECARLO);
-
-    fList->Add(evtdisp);
-    fList->Add(datacheck);
-    fList->Add(analysis);
-    fList->Add(montecarlo);
-
-    evtdisp   ->Associate(this);
-    datacheck ->Associate(this);
-    analysis  ->Associate(this);
-    montecarlo->Associate(this);
-
-    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsCenterX , 10, 10, 10, 10);
+    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsCenterX, 10, 10, 10, 10);
     fList->Add(laybut);
 
-    tab2->AddFrame(evtdisp,    laybut);
-    tab2->AddFrame(datacheck,  laybut);
-    tab2->AddFrame(analysis,   laybut);
-    tab2->AddFrame(montecarlo, laybut);
+    CreateTextButton(tab2, "Event Display",  M_BUTTON_EVTDISP,    laybut);
+    CreateTextButton(tab2, "Data Check",     M_BUTTON_DATACHECK,  laybut);
+    CreateTextButton(tab2, "Analysis",       M_BUTTON_ANALYSE,    laybut);
+    CreateTextButton(tab2, "Monte Carlo",    M_BUTTON_MONTECARLO, laybut);
+    CreateTextButton(tab2, "Camera Display", M_BUTTON_CAMDISPLAY, laybut);
 }
 
 MMars::MMars(/*const TGWindow *p,*/ UInt_t w, UInt_t h)
-  : TGMainFrame(gClient->GetRoot(), w, h)
+: TGMainFrame(gClient->GetRoot(), w, h)
+//: MBrowser (gClient->GetRoot(), gClient->GetRoot(), w, h)
 {
     //
@@ -196 +206 @@
     AddFrame(low,     layout);
 
+    //    CreateTopFrame(fTop2);
+    //    CreateBottomFrame(fTop3);
+
     //
     //   Map the window, set up the layout, etc.
     //
-    SetWMSizeHints(400, 380, 400, 380, 10, 10);  // set the smallest and biggest size of the Main frame
+    SetWMSizeHints(400, 410, 400, 410, 10, 10);  // set the smallest and biggest size of the Main frame
 
     MapSubwindows();
@@ -271 +284 @@
                 return kTRUE;
 
+            case M_BUTTON_CAMDISPLAY:
+                new MCameraDisplay(this);
+                return kTRUE;
+
             case M_PICTURE_MAGIC:
-                DisplWarning("Please open a Netscape to the MAGIC homepage");
+                DisplWarning("Please open a Netscape to the MAGIC homepage\n"
+                             "http://hegra1.mppmu.mpg.de/MAGICWeb/");
                 return kTRUE;
 
             case M_PICTURE_MARS:
-                DisplWarning("Please open a Netscape to the MARS homepage");
-                return kTRUE;
-
+                DisplWarning("Please open a Netscape to the MARS homepage\n"
+                             "http://magic.uni-sw.gwdg.de/mars/");
+                return kTRUE;
             }
 

trunk/MagicSoft/Mars/mmain/MMars.h

@@ -10 +10 @@
 #endif
 
+/*
+ #ifndef MBROWSER_H
+ #include <MBrowser.h>
+ #endif
+ */
+
 class TList;
+class TGVerticalFrame;
+class TGLayoutHints;
 
 class MMars : public TGMainFrame
@@ -20 +28 @@
     const TGPicture *fPic1;
     const TGPicture *fPic2;
+
+    void CreateTextButton(TGVerticalFrame *tab, const char *text,
+                          const UInt_t id, TGLayoutHints *hints) const;
 
     void CreateMenuBar();

trunk/MagicSoft/Mars/mmain/MainLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MDataCheck;
 #pragma link C++ class MMonteCarlo;
+#pragma link C++ class MCameraDisplay;
 
 #endif

trunk/MagicSoft/Mars/mmain/Makefile

@@ -34 +34 @@
            MAnalysis.cc \
            MMonteCarlo.cc \
+           MCameraDisplay.cc \
            MBrowser.cc