Index: trunk/MagicSoft/Mars/mhflux/MHAlpha.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHAlpha.cc	(revision 9367)
+++ trunk/MagicSoft/Mars/mhflux/MHAlpha.cc	(revision 9369)
@@ -778,5 +778,5 @@
         delete pad->GetPad(2);
 
-    if (fTimeEffOn && fTime || fHTime.GetNbinsX()>1 || fHTime.GetBinError(1)>0)
+    if ((fTimeEffOn && fTime) || fHTime.GetNbinsX()>1 || fHTime.GetBinError(1)>0)
     {
         pad->cd(3);
@@ -1097,14 +1097,8 @@
 
     if (!fSkipHistEnergy)
-        if (type==0)
-        {
-            fMap[1] = fMatrix->AddColumn("MEnergyEst.fVal");
-            fMap[2] = -1;
-        }
-        else
-        {
-            fMap[1] = -1;
-            fMap[2] = fMatrix->AddColumn("MHillas.fSize");
-        }
+    {
+        fMap[1] = type==0 ? fMatrix->AddColumn("MEnergyEst.fVal") : -1;
+        fMap[2] = type==0 ? -1 : fMatrix->AddColumn("MHillas.fSize");
+    }
 
     if (!fSkipHistTheta)
Index: trunk/MagicSoft/Mars/mhflux/MHThetaSq.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHThetaSq.cc	(revision 9367)
+++ trunk/MagicSoft/Mars/mhflux/MHThetaSq.cc	(revision 9369)
@@ -189,14 +189,8 @@
 
     if (!fSkipHistEnergy)
-        if (type==0)
-        {
-            fMap[1] = fMatrix->AddColumn("MEnergyEst.fVal");
-            fMap[2] = -1;
-        }
-        else
-        {
-            fMap[1] = -1;
-            fMap[2] = fMatrix->AddColumn("MHillas.fSize");
-        }
+    {
+        fMap[1] = type==0 ? fMatrix->AddColumn("MEnergyEst.fVal") : -1;
+        fMap[2] = type==0 ? -1 : fMatrix->AddColumn("MHillas.fSize");
+    }
 
     if (!fSkipHistTheta)
Index: trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc	(revision 9367)
+++ trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc	(revision 9369)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.11 2009-02-15 15:43:30 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.12 2009-03-01 21:48:14 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -354,14 +354,8 @@
 
     if (!fSkipHistEnergy)
-        if (type==0)
-        {
-            fMap[1] = fMatrix->AddColumn("MEnergyEst.fVal");
-            fMap[2] = -1;
-        }
-        else
-        {
-            fMap[1] = -1;
-            fMap[2] = fMatrix->AddColumn("MHillas.fSize");
-        }
+    {
+        fMap[1] = type==0 ? fMatrix->AddColumn("MEnergyEst.fVal") : -1;
+        fMap[2] = type==0 ? -1 : fMatrix->AddColumn("MHillas.fSize");
+    }
 
     if (!fSkipHistTheta)