Changeset 950 for trunk/MagicSoft/Mars/mmain/MAnalysis.cc

Timestamp:

09/26/01 15:23:21 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MAnalysis.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -30 +30 @@
 
 enum {
-  M_BUTTON_HILLAS
+    M_BUTTON_HILLAS,
+    M_CHECK_DISPLHIL
 };
+
+void MAnalysis::AddButtons()
+{
+    TGTextButton *hillas = new TGTextButton(fTop2, "Calculate Standard Hillas", M_BUTTON_HILLAS);
+
+    hillas->Associate(this);
+
+    fList->Add(hillas);
+
+    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5);
+    fList->Add(laybut);
+
+    fTop2->AddFrame(hillas, laybut);
+}
+
+void MAnalysis::AddSetupTab()
+{
+    TGCompositeFrame *frame = CreateNewTab("Setup");
+
+    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5);
+    fList->Add(laybut);
+
+    fCheckButton1 = new TGCheckButton(frame, "Display Hillas Histograms when finished", M_CHECK_DISPLHIL);
+    fCheckButton2 = new TGCheckButton(frame, "Display Star Map Histogram when finished", M_CHECK_DISPLHIL);
+
+    fList->Add(fCheckButton1);
+    fList->Add(fCheckButton2);
+
+    frame->AddFrame(fCheckButton1, laybut);
+    frame->AddFrame(fCheckButton2, laybut);
+}
 
 MAnalysis::MAnalysis(const TGWindow *main, const TGWindow *p,
@@ -37 +69 @@
 : MBrowser(main, p, w, h)
 {
-    TGTextButton *hillas = new TGTextButton(fTop2, "Calculate Standard Hillas", M_BUTTON_HILLAS);
-
-    hillas->Associate(this);
-
-    fList->Add(hillas);
-
-    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5);
-    fList->Add(laybut);
-
-    fTop2->AddFrame(hillas, laybut);
+    AddButtons();
+    AddSetupTab();
 
     MapSubwindows();
@@ -74 +98 @@
 #include "MHillas.h"
 
-void MAnalysis::CalculateHillas(const char *fname)
+void MAnalysis::CalculateHillas() const
 {
     //
     // This is a demonstration program which calculates the Hillas
     // parameter out of a Magic root file.
+
+    const Bool_t displhillas  = fCheckButton1->GetState();
+    const Bool_t displstarmap = fCheckButton2->GetState();
 
     //
@@ -131 +158 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree      read("Events", fname);
+    MReadTree      read("Events", fInputFile);
     MCerPhotCalc   ncalc;
     MImgCleanStd   clean;
@@ -137 +164 @@
     MFillH         hfill(&hillas, hists);
     MFillH         sfill(&hillas, smap);
-    //
-    // FIXME:
-    // -----
-    // I cannot use MFillH fill("name", "name") here.
-    // for me it is not yet clear why this doesn't work
-    //
-
-    /*
-     MWriteRootFile write("hillas.root");
-     write.AddContainer("MHillas");
-     write.AddContainer("MHHillas");
-     write.AddContainer(smap);
-     */
 
     tlist.AddToList(&read);
@@ -157 +171 @@
     tlist.AddToList(&hfill);
     tlist.AddToList(&sfill);
-    //tlist.AddToList(&write);
 
     //
@@ -174 +187 @@
     // After the analysis is finished we can display the histograms
     //
-    hists->Draw();
-    smap->Draw();
+
+    if (displhillas)
+        hists->Draw();
+
+    if (displstarmap)
+        smap->Draw();
 }
 
@@ -199 +216 @@
         {
         case M_BUTTON_HILLAS:
-            CalculateHillas(fInputFile);
+            CalculateHillas();
             return kTRUE;
         }