Changeset 9028 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/22/08 16:28:15 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJMerpp.cc (modified) (3 diffs)
• MJStar.cc (modified) (1 diff)
• MSequence.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJMerpp.cc

@@ -240 +240 @@
         return 1;
 
+    // FIXME: Add a check whether the file has already been merpped!!!
+
     const Bool_t isreport = fPathIn.EndsWith(".rep");
     const Bool_t isdc     = fPathIn.EndsWith(".txt");
@@ -337 +339 @@
     const TString calpath = fPathOut;
 
+    // PreCheck: We don't wantto start merpp if we
+    // know that an error will occur
+    for (UInt_t i=0; i<num; i++)
+    {
+        const TString name1 = fHeaderRun==0 ? reppath : seq.GetFileName(i, MSequence::kReportDat, reppath);
+        const TString name2 = seq.GetFileName(i, MSequence::kCalibrated, calpath);
+
+        // Full qualified name could not be determined or file is not
+        // accessible. For excluded files "0" is returned.
+        if (name1.IsNull() || name2.IsNull())
+            return 6;
+    }
+
+    // Now we can safely start processing
     TString rc;
     for (UInt_t i=0; i<num; i++)
@@ -349 +365 @@
         const TString name1 = fHeaderRun==0 ? reppath : seq.GetFileName(i, MSequence::kReportDat, reppath);
         const TString name2 = seq.GetFileName(i, MSequence::kCalibrated, calpath);
-
-        // Full qualified name could not be determined
-        // or file is not accessible
-        if (name1.IsNull() || name2.IsNull())
-            return 6;
 
         // FIXME: check runcallisto

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -408 +408 @@
     tlist2.AddToList(&clean);
     tlist2.AddToList(&poscalc);
+
+    MFillH fillsp("MHSrcPosCam", "MSrcPosCam", "FillSrcPosCam");
+    fillsp.SetNameTab("Src");
+    tlist2.AddToList(&fillsp);
+
+
     tlist2.AddToList(&hcalc);
     tlist2.AddToList(&fsparks);

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -493 +493 @@
 
         if (tel>0)
-            n += Form(".%05d", file);
+            n += Form(".%03d", file);
     }
 
@@ -1387 +1387 @@
         // Should we add a check forbidding the same run in
         // Cal/Ped/Data? What about the Exclude?
-        /*str +=*/ PrintRuns(out, pre, "Runs:     ", fRuns,     fRunsSub);
-        str += PrintRuns(out, pre, "CalRuns:  ", fCalRuns,  fCalRunsSub);
-        str += PrintRuns(out, pre, "PedRuns:  ", fPedRuns,  fPedRunsSub);
-        str += PrintRuns(out, pre, "DataRuns: ", fDatRuns,  fDatRunsSub);
-        str += PrintRuns(out, pre, "Exclude:  ", fExclRuns, fExclRunsSub);
+        /*str +=*/ PrintRuns(out, pre, "Runs:    ", fRuns,     fRunsSub);
+        str += PrintRuns(out, pre, "CalRuns: ", fCalRuns,  fCalRunsSub);
+        str += PrintRuns(out, pre, "PedRuns: ", fPedRuns,  fPedRunsSub);
+        str += PrintRuns(out, pre, "DatRuns: ", fDatRuns,  fDatRunsSub);
+        str += PrintRuns(out, pre, "Exclude: ", fExclRuns, fExclRunsSub);
     }