Changeset 7753 for trunk

Timestamp:

06/26/06 11:20:00 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (6 diffs)
• mjobs/MJCut.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/06/26 Thomas Bretz
+
+   * mjobs/MJCut.[h,cc]:
+     - added error codes for some fatal errors
+
+   * ganymed.cc:
+     - pipe error codes to shell
+
+
 
  2006/05/29 Thomas Bretz

trunk/MagicSoft/Mars/ganymed.cc

@@ -264 +264 @@
     //    job.EnableStorageOfResult();
 
-    if (!job.Process(seq))
+    const Int_t rc = job.Process(seq);
+    if (rc<=0)
     {
         gLog << err << "Calculation of cuts failed." << endl << endl;
-        return 2;
-    }
+
+        //error coding for the automatic analysis (to be filled into the database)
+        switch (rc)
+        {
+        case  0:        // MJCut failed
+            return 3;
+        case -1:        // Source not found
+            return 4;
+        case -2:        // FillRndSrcCam failed
+            return 5;
+        case -3:        // Processing off-data failed
+            return 6;
+        case -4:        // Processing on-data failed
+            return 7;
+        }
+        return 2;
+    }
+
     if (kDebugEnv>0)
         env.PrintUntouched();

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -515 +515 @@
 }
 
-Bool_t MJCut::Process(const MDataSet &set)
+Int_t MJCut::Process(const MDataSet &set)
 {
     if (!set.IsValid())
@@ -532 +532 @@
     {
         if (!set.GetSourcePos(source))
-            return kFALSE;
+            return -1;
         *fLog << all;
         source.Print("RaDec");
@@ -545 +545 @@
     {
         if (!FillSrcPosCam(set, source, hsrcpos))
-            return kFALSE;
+            return -2;
         plist.AddToList(&hsrcpos);
     }
@@ -698 +698 @@
         tlist2.AddToList(&hcalc2);
     //tlist2.AddToList(&taskenv1);
+    tlist2.AddToList(&cont0);
     tlist2.AddToList(&taskenv2);
     tlist2.AddToList(&taskenv3);
-    tlist2.AddToList(&cont0);
     if (write0)
         tlist2.AddToList(write0);
@@ -769 +769 @@
         {
             *fLog << err << GetDescriptor() << ": Processing of off-sequences failed." << endl;
-            return kFALSE;
+            return -3;
         }
 
@@ -914 +914 @@
     {
         *fLog << err << GetDescriptor() << ": Processing of on-sequences failed." << endl;
-        return kFALSE;
+        return -4;
     }
 

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -55 +55 @@
     ~MJCut();
 
-    Bool_t Process(const MDataSet &set);
+    Int_t Process(const MDataSet &set);
 
     void EnableStorageOfSummary(Bool_t b=kTRUE)  { fStoreSummary = b; } // See SetNameSummary