Changeset 6888

Timestamp:

03/24/05 11:22:20 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.cc (modified) (16 diffs)
• ganymed.cc (modified) (6 diffs)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/Makefile (modified) (1 diff)
• mars.cc (modified) (1 diff)
• merpp.cc (modified) (6 diffs)
• mhflux/MAlphaFitter.cc (modified) (2 diffs)
• mhflux/MAlphaFitter.h (modified) (1 diff)
• readdaq.cc (modified) (4 diffs)
• readraw.cc (modified) (3 diffs)
• showlog.cc (modified) (3 diffs)
• showplot.cc (modified) (2 diffs)
• sinope.cc (modified) (8 diffs)
• star.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- 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

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
  *** 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)
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -155 +155 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -201 +201 @@
         gLog << err << "Neither calibration (-c) nor signal extraction (-y) or test-mode (--use-test) specified!" << endl;
         Usage();
-        return 0;
+        return 2;
     }
 
@@ -233 +233 @@
         arg.Print("options");
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -242 +242 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -253 +253 @@
     {
         gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -259 +259 @@
     {
         gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -279 +279 @@
     {
         gLog << err << "Sequence read but not valid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -310 +310 @@
         gLog << (kInpathD.IsNull() ? "<defaultpath>" : kInpathD.Data()) << endl;
         if (!kForceExec)
-            return -1;
+            return 2;
     }
 
@@ -363 +363 @@
         {
             gLog << err << "Calculation of pedestal failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -397 +397 @@
         {
             gLog << err << "Calculation of pedestal resolution failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -427 +427 @@
         {
             gLog << err << "Calculation of calibration failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -455 +455 @@
             {
                 gLog << err << "Calibration of calibration failed." << endl << endl;
-                return -1;
+                return 2;
             }
 
@@ -495 +495 @@
         {
             gLog << err << "Calculation of fundamental pedestal failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -531 +531 @@
         {
             gLog << err << "Calculation of pedestal from extrtactor (random) failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -567 +567 @@
         {
             gLog << err << "Calculation of pedestal from extractor failed." << endl << endl;
-            return -1;
+            return 2;
         }
 
@@ -594 +594 @@
         // Where to search for calibration files
         if (!job4.ProcessFile(job1.GetPedestalCam(), job2.GetPedestalCam(), job3.GetPedestalCam()))
-            return -1;
+            return 2;
 
         if (kDebugEnv>0)

trunk/MagicSoft/Mars/ganymed.cc

@@ -98 +98 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -140 +140 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -151 +151 @@
     {
         gLog << err << "Sorry, sequences file '" << kSequences << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -157 +157 @@
     {
         gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -179 +179 @@
     {
         gLog << err << "Sequences read but not valid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -228 +228 @@
     {
         gLog << err << "Calculation of cuts failed." << endl << endl;
-        return -1;
+        return 2;
     }
     if (kDebugEnv>0)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -14 +14 @@
 #pragma link C++ class MMultiDimDistCalc+;
 
+#pragma link C++ class MEnergyEst+;
 #pragma link C++ class MEnergyEstimate+;
 

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -28 +28 @@
 SRCFILES = MGeomApply.cc \
            MCameraData.cc \
+           MEnergyEst.cc \
            MEnergyEstimate.cc \
            MHadronness.cc \

trunk/MagicSoft/Mars/mars.cc

@@ -86 +86 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 

trunk/MagicSoft/Mars/merpp.cc

@@ -158 +158 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -197 +197 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -233 +233 @@
     {
         gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -242 +242 @@
     {
         gLog << err << "Sorry, you don't have write permission for '" << kNameout << "'." << endl;
-        return -1;
+        return 2;
     }
 
@@ -248 +248 @@
     {
         gLog << err << "Sorry, file '" << kNameout << "' already existing." << endl;
-        return -1;
+        return 2;
     }
 
@@ -413 +413 @@
     {
         gLog << err << "ERROR: Merging and preprocessing failed!" << endl;
-        return -1;
+        return 2;
     }
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -501 +501 @@
     case kSignificanceChi2:
         return -GetSignificance()/GetChiSqSignal();
+    case kSignificanceExcess:
+        return -GetSignificance()*GetEventsExcess();
+    case kExcess:
+        return -GetEventsExcess();
     }
     return 0;
@@ -557 +561 @@
         if (txt==(TString)"significancechi2")
             fStrategy = kSignificanceChi2;
+        if (txt==(TString)"significanceexcess")
+            fStrategy = kSignificanceExcess;
+        if (txt==(TString)"excess")
+            fStrategy = kExcess;
         rc = kTRUE;
     }

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -30 +30 @@
     enum Strategy_t {
         kSignificance,
-        kSignificanceChi2
+        kSignificanceChi2,
+        kSignificanceExcess,
+        kExcess
     };
 private:

trunk/MagicSoft/Mars/readdaq.cc

@@ -70 +70 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -90 +90 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -112 +112 @@
     {
         gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -192 +192 @@
     {
         gLog << err << "ERROR: Reading DAQ file failed!" << endl;
-        return -1;
+        return 2;
     }
 

trunk/MagicSoft/Mars/readraw.cc

@@ -81 +81 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -123 +123 @@
     {
         gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -157 +157 @@
     {
         gLog << err << "Tree 'Events' not found in file... exit!" << endl;
-        return -1;
+        return 2;
     }
 

trunk/MagicSoft/Mars/showlog.cc

@@ -57 +57 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -77 +77 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -85 +85 @@
     {
         gLog << "Cannot open file " << arg.GetArgumentStr(0) << ": " << strerror(errno) << endl;
-        return -1;
+        return 2;
     }
 

trunk/MagicSoft/Mars/showplot.cc

@@ -68 +68 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -93 +93 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 

trunk/MagicSoft/Mars/sinope.cc

@@ -262 +262 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -293 +293 @@
         arg.Print("options");
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -300 +300 @@
         gLog << warn << "ERROR - No '--run=' option given... required." << endl;
         gLog << endl;
-        return -1;
+        return 2;
     }
     if (kDate.IsNull())
@@ -306 +306 @@
         gLog << warn << "ERROR - No '--date=' option given... required." << endl;
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -315 +315 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -337 +337 @@
     {
         gLog << err << "Sequence invalid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -360 +360 @@
         {
             gLog << err << "Sorry, file '" << file << "' exists... use -f option.." << endl;
-            return -1;
+            return 2;
         }
         file = Form("%stxt", kOutpath.Data());
@@ -366 +366 @@
         {
             gLog << err << "Sorry, file '" << file << "' exists... use -f option.." << endl;
-            return -1;
+            return 2;
         }
     }

trunk/MagicSoft/Mars/star.cc

@@ -103 +103 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -131 +131 @@
         arg.Print("options");
         gLog << endl;
-        return -1;
+        return 2;
     }
 
@@ -140 +140 @@
     {
         Usage();
-        return -1;
+        return 2;
     }
 
@@ -151 +151 @@
     {
         gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -157 +157 @@
     {
         gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return -1;
+        return 2;
     }
 
@@ -174 +174 @@
     {
         gLog << err << "Sequence read but not valid!" << endl << endl;
-        return -1;
+        return 2;
     }
 
@@ -228 +228 @@
         {
             gLog << err << "Calculation of image parameters failed." << endl << endl;
-            return -1;
+            return 2;
         }