Changeset 9276 for trunk/MagicSoft

Timestamp:

01/27/09 11:29:45 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.cc (modified) (1 diff)
• ceres.cc (modified) (2 diffs)
• ganymed.cc (modified) (1 diff)
• mbase/MParEnv.cc (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (3 diffs)
• showplot.cc (modified) (1 diff)
• sponde.cc (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/callisto.cc

@@ -350 +350 @@
 
     TApplication app("callisto", &argc, argv);
-    if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
+    if ((!gROOT->IsBatch() && !gClient) || (gROOT->IsBatch() && !kBatch))
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;

trunk/MagicSoft/Mars/ceres.cc

@@ +1 @@
+#include <TClass.h>
 #include <TSystem.h>
 #include <TApplication.h>
@@ -166 +167 @@
 
     TApplication app("ceres", &argc, argv);
-    if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
+    if ((!gROOT->IsBatch() && !gClient) || (gROOT->IsBatch() && !kBatch))
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;

trunk/MagicSoft/Mars/ganymed.cc

@@ -260 +260 @@
 
     TApplication app("ganymed", &argc, argv);
-    if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
+    if ((!gROOT->IsBatch() && !gClient) || (gROOT->IsBatch() && !kBatch))
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;

trunk/MagicSoft/Mars/mbase/MParEnv.cc

@@ -36 +36 @@
 #include "MParEnv.h"
 
+#include <TClass.h>
 #include <TInterpreter.h>
 

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -30 +30 @@
 #include "MJSimulation.h"
 
-//#include <TEnv.h>
-//#include <TFile.h>
+#include <TEnv.h>
 
 // Core
@@ -72 +71 @@
 
 #include "MHn.h"
-#include "MHPSF.h"
 #include "MHCamEvent.h"
 #include "MHPhotonEvent.h"
@@ -497 +495 @@
         //if (header.IsPointRun())
         //    tasks.AddToList(&fillP);
-        tasks.AddToList(&cont);
+        tasks.AddToList(&cont1);
         if (!header.IsPointRun())
             tasks.AddToList(&fillh2);

trunk/MagicSoft/Mars/showplot.cc

@@ -236 +236 @@
     //
     TApplication *app = kRoot ? new TRint("showplot", &argc, argv) : new TApplication("showplot", &argc, argv);
-    if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
+    if ((!gROOT->IsBatch() && !gClient) || (gROOT->IsBatch() && !kBatch))
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;

trunk/MagicSoft/Mars/sponde.cc

@@ -225 +225 @@
 
     TApplication app("sponde", &argc, argv);
-    if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
+    if ((!gROOT->IsBatch() && !gClient) || (gROOT->IsBatch() && !kBatch))
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;

trunk/MagicSoft/Mars/star.cc

@@ -216 +216 @@
 
     TApplication app("star", &argc, argv);
-    if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
+    if ((!gROOT->IsBatch() && !gClient) || (gROOT->IsBatch() && !kBatch))
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;