Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9277)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9278)
@@ -74,4 +74,17 @@
    * msimrelfector/MSimReflector.cc:
      - added sanity check if reflector is valid
+
+   * datacenter/macros/insertdataset.C:
+     - added fPriority
+
+   * datacenter/macros/plotoptical.C:
+     - write a root-file as the other plot-macros do
+
+   * mreflector/MHReflector.cc:
+     - added some SetDirectory(NULL), although this class is a candidate
+       for removal
+
+   * mjobs/MJCut.cc, mjobs/MJCalibrateSignal.cc:
+     - make the CheckEnv fail if kFALSE is returned
 
 
Index: trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C	(revision 9277)
+++ trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C	(revision 9278)
@@ -102,5 +102,6 @@
         return 0;
 
-    vals = Form("fDataSetNumber='%s', fDataSetInserted=Now()", number.Data());
+    vals = Form("fDataSetNumber='%s', fPriority='%s', fDataSetInserted=Now()",
+                number.Data(), number.Data());
     rc = serv.Insert("DataSetProcessStatus", vals);
 
Index: trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C	(revision 9277)
+++ trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C	(revision 9278)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.10 2008-08-15 12:14:52 dorner Exp $
+! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.11 2009-01-27 13:56:15 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -191,5 +191,5 @@
     plotalloptical(plot, source);
     // Use this to create output plots automatically
-    //  d->SaveAsRoot("plotoptical.root");
+    d->SaveAsRoot("plotoptical.root");
     //  d->SaveAsPS("plotoptical.ps");
 
@@ -222,5 +222,5 @@
     plotalloptical(plot, source);
     // Use this to create output plots automatically
-    //  d->SaveAsRoot(plot+"plotoptical.root");
+    d->SaveAsRoot("plotoptical.root");
     //  d->SaveAsPS("plotoptical.ps");
 
@@ -254,5 +254,5 @@
 
     // Use this to create output plots automatically
-    //  d->SaveAsRoot("plotoptical.root");
+    d->SaveAsRoot("plotoptical.root");
     //  d->SaveAsPS("plotoptical.ps");
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 9277)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 9278)
@@ -244,4 +244,6 @@
     }
 
+    // --------------------------------------------------------------------------------
+
     *fLog << inf;
     fLog->Separator(GetDescriptor());
@@ -250,8 +252,6 @@
 
 
-    //if (!CheckEnv())
-    //    return kFALSE;
-
-    CheckEnv();
+    if (!CheckEnv())
+        return kFALSE;
 
     // --------------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mjobs/MJCut.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 9277)
+++ trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 9278)
@@ -555,5 +555,6 @@
         return kFALSE;
 
-    CheckEnv();
+    if (!CheckEnv())
+        return kFALSE;
 
     // --------------------------------------------------------------------------------
@@ -576,4 +577,6 @@
     else
         *fLog << all << "No source position applied..." << endl;
+
+    // ADD A CHECK FOR THE SOURCE POSITION by COMPARISON WITH RA/DEC
 
     MParList plist;
Index: trunk/MagicSoft/Mars/mreflector/MHReflector.cc
===================================================================
--- trunk/MagicSoft/Mars/mreflector/MHReflector.cc	(revision 9277)
+++ trunk/MagicSoft/Mars/mreflector/MHReflector.cc	(revision 9278)
@@ -59,5 +59,4 @@
     fTitle = title ? title : "Histogram for the reflected photons";
 
-    fHistXY.SetDirectory(NULL);
     fHistXY.SetName("ReflXY");
     fHistXY.SetTitle("Histogram vs X/Y and Energy");
@@ -65,7 +64,7 @@
     fHistXY.SetYTitle("Y [\\circ]");
     fHistXY.SetZTitle("E [GeV]");
+    fHistXY.SetDirectory(NULL);
     fHistXY.Sumw2();
 
-    fHistRad.SetDirectory(NULL);
     fHistRad.SetName("ReflRad");
     fHistRad.SetTitle("Histogram vs Radius and Energy");
@@ -73,7 +72,7 @@
     fHistRad.SetYTitle("R [\\circ]");
     fHistRad.SetZTitle("Cnts/deg^{2}");
+    fHistRad.SetDirectory(NULL);
     fHistRad.Sumw2();
 
-    fHistSize.SetDirectory(NULL);
     fHistSize.SetName("ReflSize");
     fHistSize.SetTitle("Histogram vs Size and Energy");
@@ -81,4 +80,5 @@
     fHistSize.SetYTitle("N\\gamma");
     fHistSize.SetZTitle("Cnts");
+    fHistSize.SetDirectory(NULL);
     fHistSize.Sumw2();
 
@@ -111,4 +111,5 @@
         return kFALSE;
     }
+
     MGeomCam *geom = (MGeomCam*)pList->FindObject("MGeomCam");
     if (!geom)
Index: trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc
===================================================================
--- trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc	(revision 9277)
+++ trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc	(revision 9278)
@@ -302,5 +302,6 @@
     if (triggers.GetEntriesFast()==0)
     {
-        *fLog << all << rmlo << "/" << rmhi << " trigger out of valid range. No trigger raised." << endl;
+        if (rmlo>0 || rmhi>0)
+            *fLog << all << rmlo << "/" << rmhi << " trigger out of valid range. No trigger raised." << endl;
         return kTRUE;
     }