Changeset 6069 for trunk

Timestamp:

01/28/05 10:09:32 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/01/28 Thomas Bretz
+
+   * mjobs/MJCalibrateSignal.cc:
+     - fixed that extract1,2,3 haven't been deleted if loop failed.
+     - print tasklist also if loop failed.
+
+
+
  2005/01/28 Markus Gaug
 
@@ -25 +33 @@
      - introduce a security check for the time fine adjustment in case, 
        it is too large.
+
 
 
@@ -33 +42 @@
        fraction of total). Moved MSrcPosCam in output from RunHeaders
        to Events tree.
+
+
 
  2005/01/27 Daniel Mazin and Markus Gaug

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -573 +573 @@
     MFillH fill7(&evt7, "MArrivalTime",           "FillTimes");
     MFillH fill8(&evt8, "MCalibrateData",         "FillConv");
+
+    MTaskEnv fillflorian("FinalFantasy");
+    fillflorian.SetDefault();
 
     // The second rule is for the case reading raw-files!
@@ -686 +689 @@
       tlist2.AddToList(&fill7);
 
+    tlist2.AddToList(&fillflorian);
+
     // Setup List for Drive-tree
     MPointingPosCalc pcalc;
@@ -711 +716 @@
 
     // Execute first analysis
-    if (!evtloop.Eventloop(fMaxEvents))
+    const Bool_t rc = evtloop.Eventloop(fMaxEvents);
+
+    // Print statistics
+    tlist.PrintStatistics();
+
+    // make sure owned object are deleted
+    if (extractor1)
+        delete extractor1;
+    if (extractor2)
+        delete extractor2;
+    if (extractor3)
+        delete extractor3;
+
+    // return if job failed
+    if (!rc)
     {
         *fLog << err << GetDescriptor() << ": Failed." << endl;
@@ -717 +736 @@
     }
 
-    tlist.PrintStatistics();
-
+    // if everything went ok write and display result
     DisplayResult(plist);
 
@@ -724 +742 @@
         return kFALSE;
 
-    if (extractor1)
-      delete extractor1;
-    if (extractor2)
-      delete extractor2;
-    if (extractor3)
-      delete extractor3;
- 
+    // return if job went ok
     *fLog << all << GetDescriptor() << ": Done." << endl;
     *fLog << endl << endl;