Changeset 2447 for trunk/MagicSoft/Mars

Timestamp:

10/31/03 15:38:02 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mars.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+  2003/10/31: Thomas Bretz
+
+   * mars.cc:
+     - change TGApllication back to TApplication (TGApplication doesn't
+       load the TVirtualPad plugin by default) DISPLAY must be set
+       manually if it is not set.
+
+
+
   2003/10/30: Antonio Stamerra
 
-  * manalysis/MMcTriggerLvl2.[h,cc]
-    - Added method CalcTriggerPattern to check which x-NN compact
-      pattern the event satisfies. The variable member fTriggerPattern 
-      contains the number x (x=3,4,5,6,7). 
-    - Inline function GetTriggerPattern added.
-
-  * manalysis/MMcTriggerLvl2Calc.cc
-    - Added call to the MMcTriggerLvl2::CalcTriggerPattern in Process().
+   * manalysis/MMcTriggerLvl2.[h,cc]
+     - Added method CalcTriggerPattern to check which x-NN compact
+       pattern the event satisfies. The variable member fTriggerPattern 
+       contains the number x (x=3,4,5,6,7). 
+     - Inline function GetTriggerPattern added.
+
+   * manalysis/MMcTriggerLvl2Calc.cc
+     - Added call to the MMcTriggerLvl2::CalcTriggerPattern in Process().
+
 
 

trunk/MagicSoft/Mars/mars.cc

@@ -1 +1 @@
 #include <TROOT.h>
-#include <TGApplication.h>
+#include <TApplication.h>
 
 #include "MAGIC.h"
@@ -59 +59 @@
     StartUpMessage();
 
-    TGApplication app("MarsApp", &argc, argv);
-    if (gROOT->IsBatch())
+    TApplication app("MarsApp", &argc, argv);
+    if (gROOT->IsBatch() || !gClient)
+    {
+        gLog << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;
+        return 1;
+    }
+    /*
+     TGApplication app("MarsApp", &argc, argv);
+     if (gROOT->IsBatch())
         gROOT->SetBatch(kFALSE);
+     */
 
     //