Changeset 8222 for trunk/MagicSoft

Timestamp:

12/11/06 15:05:11 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (3 diffs)
• MJSpectrum.cc (modified) (4 diffs)
• MSequence.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -467 +467 @@
     read.AddTree("EffectiveOnTime");
 
-    set.AddFilesOn(read);
+    if (!set.AddFilesOn(read))
+        return kFALSE;
 
     MFillH fill(&hsrcpos, "MSrcPosCam", "FillSrcPosCam");
@@ -632 +633 @@
 
     MRead &readoff = fIsMonteCarlo ? (MRead&)readoffmc : (MRead&)readoffdata;
-    if (fIsWobble)
-        set.AddFilesOn(readoff);
-    else
-        set.AddFilesOff(readoff);
+    const Bool_t setrc = fIsWobble ? set.AddFilesOn(readoff) : set.AddFilesOff(readoff);
+    if (!setrc)
+        return kFALSE;
 
     const TString path(Form("%s/", fPathOut.Data()));
@@ -798 +798 @@
 
     MRead &readon = fIsMonteCarlo ? (MRead&)readonmc : (MRead&)readondata;
-    set.AddFilesOn(readon);
+    if (!set.AddFilesOn(readon))
+        return kFALSE;
 
     scalc.SetMode(MSrcPosCalc::kDefault);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -190 +190 @@
     // Read the first corsika RunHeader from the MC files
     TChain chain("RunHeaders");
-    set.AddFilesOn(chain);
+    if (!set.AddFilesOn(chain))
+        return kFALSE;
 
     MMcCorsikaRunHeader *h=0;
@@ -292 +293 @@
     // Create chain
     TChain chain("OriginalMC");
-    set.AddFilesOn(chain);
+    if (!set.AddFilesOn(chain))
+        return kFALSE;
 
     // Prepare histogram
@@ -507 +509 @@
     MReadMarsFile readmc("OriginalMC");
     //readmc.DisableAutoScheme();
-    set.AddFilesOn(readmc);
+    if (!set.AddFilesOn(readmc))
+        return kFALSE;
+
     readmc.EnableBranch("MMcEvtBasic.fTelescopeTheta");
     readmc.EnableBranch("MMcEvtBasic.fEnergy");
@@ -1140 +1144 @@
     MReadMarsFile read("Events");
     read.DisableAutoScheme();
-    set.AddFilesOn(read);
+    if (!set.AddFilesOn(read))
+        return kFALSE;
 
     // Selector to get correct (final) theta-distribution

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -296 +296 @@
     {
         *fLog << err;
-        *fLog < "ERROR - No input files for sequence #" << GetSequence() << endl;
+        *fLog << "ERROR - No input files for sequence #" << GetSequence() << endl;
         *fLog << "        read from " << GetName() << endl;
         *fLog << "        found in" << (def?" default-path ":" ") << d << endl;