Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6887)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6888)
@@ -21,4 +21,18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/03/24 Thomas Bretz
+
+   * callisto.cc, ganymed.cc, mars.cc, merpp.cc, readdaq.cc,
+     readraw.cc, showlog.cc, showplot.cc, sinope.cc, star.cc:
+     - replaced all returns of -1 by return 2
+
+   * manalysis/AnalysisLinkDef.h, manalysis/Makefile:
+     - added MEnergyEst (container)
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - implemented new fit result options
+
+
 
  2005/03/23 Markus Gaug
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 6887)
+++ trunk/MagicSoft/Mars/NEWS	(revision 6888)
@@ -2,4 +2,10 @@
  *** Version <cvs>
 
+
+   - Fix bug on the arrival time reconstruction when using Digital
+     Filter
+
+   - all executables now return 2 where in previous versions -1 has
+     been returned (gave problems with shell-scripts)
 
 
Index: trunk/MagicSoft/Mars/callisto.cc
===================================================================
--- trunk/MagicSoft/Mars/callisto.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/callisto.cc	(revision 6888)
@@ -155,5 +155,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -201,5 +201,5 @@
         gLog << err << "Neither calibration (-c) nor signal extraction (-y) or test-mode (--use-test) specified!" << endl;
         Usage();
-        return 0;
+        return 2;
     }
 
@@ -233,5 +233,5 @@
         arg.Print("options");
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -242,5 +242,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -253,5 +253,5 @@
     {
         gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -259,5 +259,5 @@
     {
         gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -279,5 +279,5 @@
     {
         gLog << err << "Sequence read but not valid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -310,5 +310,5 @@
         gLog << (kInpathD.IsNull() ? "<defaultpath>" : kInpathD.Data()) << endl;
         if (!kForceExec)
-            return -1;
+            return 2;
     }
 
@@ -363,5 +363,5 @@
         {
             gLog << err << "Calculation of pedestal failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -397,5 +397,5 @@
         {
             gLog << err << "Calculation of pedestal resolution failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -427,5 +427,5 @@
         {
             gLog << err << "Calculation of calibration failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -455,5 +455,5 @@
             {
                 gLog << err << "Calibration of calibration failed." << endl << endl;
-                return -1;
+                return 2;
             }
 
@@ -495,5 +495,5 @@
         {
             gLog << err << "Calculation of fundamental pedestal failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -531,5 +531,5 @@
         {
             gLog << err << "Calculation of pedestal from extrtactor (random) failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -567,5 +567,5 @@
         {
             gLog << err << "Calculation of pedestal from extractor failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -594,5 +594,5 @@
         // Where to search for calibration files
         if (!job4.ProcessFile(job1.GetPedestalCam(), job2.GetPedestalCam(), job3.GetPedestalCam()))
-            return -1;
+            return 2;
 
         if (kDebugEnv>0)
Index: trunk/MagicSoft/Mars/ganymed.cc
===================================================================
--- trunk/MagicSoft/Mars/ganymed.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/ganymed.cc	(revision 6888)
@@ -98,5 +98,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -140,5 +140,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -151,5 +151,5 @@
     {
         gLog << err << "Sorry, sequences file '" << kSequences << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -157,5 +157,5 @@
     {
         gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -179,5 +179,5 @@
     {
         gLog << err << "Sequences read but not valid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -228,5 +228,5 @@
     {
         gLog << err << "Calculation of cuts failed." << endl << endl;
-        return -1;
+        return 2;
     }
     if (kDebugEnv>0)
Index: trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 6887)
+++ trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 6888)
@@ -14,4 +14,5 @@
 #pragma link C++ class MMultiDimDistCalc+;
 
+#pragma link C++ class MEnergyEst+;
 #pragma link C++ class MEnergyEstimate+;
 
Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 6887)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 6888)
@@ -28,4 +28,5 @@
 SRCFILES = MGeomApply.cc \
            MCameraData.cc \
+           MEnergyEst.cc \
            MEnergyEstimate.cc \
            MHadronness.cc \
Index: trunk/MagicSoft/Mars/mars.cc
===================================================================
--- trunk/MagicSoft/Mars/mars.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/mars.cc	(revision 6888)
@@ -86,5 +86,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
Index: trunk/MagicSoft/Mars/merpp.cc
===================================================================
--- trunk/MagicSoft/Mars/merpp.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/merpp.cc	(revision 6888)
@@ -158,5 +158,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -197,5 +197,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -233,5 +233,5 @@
     {
         gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -242,5 +242,5 @@
     {
         gLog << err << "Sorry, you don't have write permission for '" << kNameout << "'." << endl;
-        return -1;
+        return 2;
     }
 
@@ -248,5 +248,5 @@
     {
         gLog << err << "Sorry, file '" << kNameout << "' already existing." << endl;
-        return -1;
+        return 2;
     }
 
@@ -413,5 +413,5 @@
     {
         gLog << err << "ERROR: Merging and preprocessing failed!" << endl;
-        return -1;
+        return 2;
     }
 
Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 6888)
@@ -501,4 +501,8 @@
     case kSignificanceChi2:
         return -GetSignificance()/GetChiSqSignal();
+    case kSignificanceExcess:
+        return -GetSignificance()*GetEventsExcess();
+    case kExcess:
+        return -GetEventsExcess();
     }
     return 0;
@@ -557,4 +561,8 @@
         if (txt==(TString)"significancechi2")
             fStrategy = kSignificanceChi2;
+        if (txt==(TString)"significanceexcess")
+            fStrategy = kSignificanceExcess;
+        if (txt==(TString)"excess")
+            fStrategy = kExcess;
         rc = kTRUE;
     }
Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h	(revision 6887)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h	(revision 6888)
@@ -30,5 +30,7 @@
     enum Strategy_t {
         kSignificance,
-        kSignificanceChi2
+        kSignificanceChi2,
+        kSignificanceExcess,
+        kExcess
     };
 private:
Index: trunk/MagicSoft/Mars/readdaq.cc
===================================================================
--- trunk/MagicSoft/Mars/readdaq.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/readdaq.cc	(revision 6888)
@@ -70,5 +70,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -90,5 +90,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -112,5 +112,5 @@
     {
         gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -192,5 +192,5 @@
     {
         gLog << err << "ERROR: Reading DAQ file failed!" << endl;
-        return -1;
+        return 2;
     }
 
Index: trunk/MagicSoft/Mars/readraw.cc
===================================================================
--- trunk/MagicSoft/Mars/readraw.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/readraw.cc	(revision 6888)
@@ -81,5 +81,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -123,5 +123,5 @@
     {
         gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -157,5 +157,5 @@
     {
         gLog << err << "Tree 'Events' not found in file... exit!" << endl;
-        return -1;
+        return 2;
     }
 
Index: trunk/MagicSoft/Mars/showlog.cc
===================================================================
--- trunk/MagicSoft/Mars/showlog.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/showlog.cc	(revision 6888)
@@ -57,5 +57,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -77,5 +77,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -85,5 +85,5 @@
     {
         gLog << "Cannot open file " << arg.GetArgumentStr(0) << ": " << strerror(errno) << endl;
-        return -1;
+        return 2;
     }
 
Index: trunk/MagicSoft/Mars/showplot.cc
===================================================================
--- trunk/MagicSoft/Mars/showplot.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/showplot.cc	(revision 6888)
@@ -68,5 +68,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -93,5 +93,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
Index: trunk/MagicSoft/Mars/sinope.cc
===================================================================
--- trunk/MagicSoft/Mars/sinope.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/sinope.cc	(revision 6888)
@@ -262,5 +262,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -293,5 +293,5 @@
         arg.Print("options");
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -300,5 +300,5 @@
         gLog << warn << "ERROR - No '--run=' option given... required." << endl;
         gLog << endl;
-        return -1;
+        return 2;
     }
     if (kDate.IsNull())
@@ -306,5 +306,5 @@
         gLog << warn << "ERROR - No '--date=' option given... required." << endl;
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -315,5 +315,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -337,5 +337,5 @@
     {
         gLog << err << "Sequence invalid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -360,5 +360,5 @@
         {
             gLog << err << "Sorry, file '" << file << "' exists... use -f option.." << endl;
-            return -1;
+            return 2;
         }
         file = Form("%stxt", kOutpath.Data());
@@ -366,5 +366,5 @@
         {
             gLog << err << "Sorry, file '" << file << "' exists... use -f option.." << endl;
-            return -1;
+            return 2;
         }
     }
Index: trunk/MagicSoft/Mars/star.cc
===================================================================
--- trunk/MagicSoft/Mars/star.cc	(revision 6887)
+++ trunk/MagicSoft/Mars/star.cc	(revision 6888)
@@ -103,5 +103,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -131,5 +131,5 @@
         arg.Print("options");
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -140,5 +140,5 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -151,5 +151,5 @@
     {
         gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -157,5 +157,5 @@
     {
         gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -174,5 +174,5 @@
     {
         gLog << err << "Sequence read but not valid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -228,5 +228,5 @@
         {
             gLog << err << "Calculation of image parameters failed." << endl << endl;
-            return -1;
+            return 2;
         }