Changeset 2497 for trunk/MagicSoft/Mars/mmain

Timestamp:

11/10/03 14:08:04 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MAnalysis.cc (modified) (10 diffs)
• MMonteCarlo.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -61 +61 @@
     //
     TGCompositeFrame *frame = CreateNewTab("Setup");
-
+ /*
     TGGroupFrame *grp = new TGGroupFrame(frame, "Setup Display");
     fList->Add(grp);
@@ -87 +87 @@
     grp->AddFrame(fCheckButton1, laybut);
     grp->AddFrame(fCheckButton2, laybut);
-
+ */
     TGLayoutHints *laygrp = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 20, 20, 20);
     fList->Add(laygrp);
-
+ /*
     frame->AddFrame(grp, laygrp);
+  */
 
     /*
@@ -120 +121 @@
 // ======================================================================
 
+#include "MStatusDisplay.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -138 +140 @@
 #include "MEvtLoop.h"
 #include "MHillas.h"
+#include "MGeomApply.h"
 
 void MAnalysis::CalculateHillas()
@@ -145 +148 @@
     // parameter out of a Magic root file.
 
-    const Bool_t displhillas  = fCheckButton1->GetState();
-    const Bool_t displstarmap = fCheckButton2->GetState();
+    const Bool_t displhillas  = kTRUE;//fCheckButton1->GetState();
+    const Bool_t displstarmap = kTRUE;//fCheckButton2->GetState();
 
     //
@@ -193 +196 @@
     //
     MReadMarsFile read("Events", fInputFile);
-
+    read.DisableAutoScheme();
+
+    MGeomApply         apply;
     MMcPedestalCopy    pcopy;
     MMcPedestalNSBAdd  pdnsb;
@@ -216 +221 @@
 
     tlist.AddToList(&read);
+    tlist.AddToList(&apply);
     tlist.AddToList(&pcopy);
     tlist.AddToList(&pdnsb);
@@ -245 +251 @@
     // Add ProgressBar to window
     //
-    TGProgressBar *bar = CreateProgressBar(fTop2);
-    evtloop.SetProgressBar(bar);
+    TGProgressBar *bar = NULL;
+    if (displhillas || displstarmap)
+    {
+        MStatusDisplay *d=new MStatusDisplay;
+        evtloop.SetDisplay(d);
+    }
+    else
+    {
+        bar = CreateProgressBar(fTop2);
+        evtloop.SetProgressBar(bar);
+    }
+
 
     //
     // Execute your analysis
     //
-    Bool_t rc = evtloop.Eventloop();
+    /*Bool_t rc =*/ evtloop.Eventloop();
 
     //
     // Remove progressbar from window
     //
-    DestroyProgressBar(bar);
-
+    if (bar)
+        DestroyProgressBar(bar);
+
+ /*
     if (!rc)
         return;
@@ -270 +288 @@
         plist.FindObject("MHHillasSrc")->DrawClone();
         plist.FindObject("MHNewImagePar")->DrawClone();
-        /*
-         plist.FindObject("HistSource")->DrawClone();
-         plist.FindObject("HistAntiSrc")->DrawClone();
-         */
     }
 
@@ -281 +295 @@
     cout << endl;
     cout << "Calculation of Hillas Parameters finished without error!" << endl;
+ */
 }
 

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -197 +197 @@
 #include "MMcCollectionAreaCalc.h"
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,05,05)
 #include "../mmc/MMcTrig.hxx" // FIXME: see FIXME below
+#endif
 
 Int_t MMonteCarlo::GetDim() const
@@ -228 +230 @@
     plist.AddToList(&tlist);
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,05,05)
     //
     // FIXME: This line is needed that root finds the MMc-classes in the
@@ -235 +238 @@
     //
     MMcTrig trig;
+#endif
 
     //
@@ -326 +330 @@
     plist.AddToList(&hists);
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,05,05)
     //
     // FIXME: This line is needed that root finds the MMc-classes in the
@@ -333 +338 @@
     //
     MMcTrig trig;
+#endif
 
     //
@@ -412 +418 @@
     plist.AddToList(&hists);
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,05,05)
     //
     // FIXME: This line is needed that root finds the MMc-classes in the
@@ -419 +426 @@
     //
     MMcTrig trig;
+#endif
 
     //