Index: trunk/MagicSoft/Mars/callisto.cc
===================================================================
--- trunk/MagicSoft/Mars/callisto.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/callisto.cc	(revision 9276)
@@ -350,5 +350,5 @@
 
     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;
Index: trunk/MagicSoft/Mars/ceres.cc
===================================================================
--- trunk/MagicSoft/Mars/ceres.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/ceres.cc	(revision 9276)
@@ -1,2 +1,3 @@
+#include <TClass.h>
 #include <TSystem.h>
 #include <TApplication.h>
@@ -166,5 +167,5 @@
 
     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;
Index: trunk/MagicSoft/Mars/ganymed.cc
===================================================================
--- trunk/MagicSoft/Mars/ganymed.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/ganymed.cc	(revision 9276)
@@ -260,5 +260,5 @@
 
     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;
Index: trunk/MagicSoft/Mars/mbase/MParEnv.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MParEnv.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/mbase/MParEnv.cc	(revision 9276)
@@ -36,4 +36,5 @@
 #include "MParEnv.h"
 
+#include <TClass.h>
 #include <TInterpreter.h>
 
Index: trunk/MagicSoft/Mars/mjobs/MJSimulation.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJSimulation.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/mjobs/MJSimulation.cc	(revision 9276)
@@ -30,6 +30,5 @@
 #include "MJSimulation.h"
 
-//#include <TEnv.h>
-//#include <TFile.h>
+#include <TEnv.h>
 
 // Core
@@ -72,5 +71,4 @@
 
 #include "MHn.h"
-#include "MHPSF.h"
 #include "MHCamEvent.h"
 #include "MHPhotonEvent.h"
@@ -497,5 +495,5 @@
         //if (header.IsPointRun())
         //    tasks.AddToList(&fillP);
-        tasks.AddToList(&cont);
+        tasks.AddToList(&cont1);
         if (!header.IsPointRun())
             tasks.AddToList(&fillh2);
Index: trunk/MagicSoft/Mars/showplot.cc
===================================================================
--- trunk/MagicSoft/Mars/showplot.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/showplot.cc	(revision 9276)
@@ -236,5 +236,5 @@
     //
     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;
Index: trunk/MagicSoft/Mars/sponde.cc
===================================================================
--- trunk/MagicSoft/Mars/sponde.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/sponde.cc	(revision 9276)
@@ -225,5 +225,5 @@
 
     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;
Index: trunk/MagicSoft/Mars/star.cc
===================================================================
--- trunk/MagicSoft/Mars/star.cc	(revision 9275)
+++ trunk/MagicSoft/Mars/star.cc	(revision 9276)
@@ -216,5 +216,5 @@
 
     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;