Changeset 8719 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/28/07 13:03:04 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (1 diff)
• MJSpectrum.cc (modified) (5 diffs)
• MJob.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -550 +550 @@
         return kFALSE;
     }
+
+    if (!HasWritePermission(GetOutputFile(set.GetNumAnalysis())))
+        return kFALSE;
 
     CheckEnv();

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1009 +1009 @@
     spectrum.SetMarkerStyle(kFullDotMedium);
     spectrum.SetTitle("Differential flux times E^{2}");
-    spectrum.SetYTitle("E^{2}#cdot dN/dE [N#cdot TeV/sm^{2}]");
+    spectrum.SetYTitle("E^{2}·dN/dE [N·TeV/sm^{2}]");
     spectrum.SetDirectory(0);
     spectrum.DrawCopy();
@@ -1316 +1316 @@
     }
 
+    if (!HasWritePermission(GetPathOut()))
+        return kFALSE;
+
     CheckEnv();
 
@@ -1324 +1327 @@
     *fLog << "Compile Monte Carlo Sample (data set " << set.GetName() << ")" << endl;
     *fLog << endl;
+
+    if (fDisplay)
+        fDisplay->SetWindowName(fName);
 
     // Setup everything which is read from the ganymed file
@@ -1616 +1622 @@
     tlist2.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime);
 
-    MEvtLoop loop2("FillMonteCarlo"); // ***** fName *****
+    MEvtLoop loop2(fName); // ***** fName *****
     loop2.SetParList(&plist);
     loop2.SetDisplay(fDisplay);
@@ -1685 +1691 @@
         cont.Add(fDisplay);
 
-    return WriteContainer(cont, "", "RECREATE");
-}
+    if (!WriteContainer(cont, "", "RECREATE"))
+    {
+        *fLog << err << GetDescriptor() << ": Writing result failed." << endl;
+        return kFALSE;
+    }
+
+    *fLog << all << GetDescriptor() << ": Done." << endl;
+    *fLog << endl << endl;
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -329 +329 @@
 //
 // Checks whether write permissions to fname exists including
-// the fOverwrite data amember.
+// the fOverwrite data member. Empty file names return kTRUE
 //
 Bool_t MJob::HasWritePermission(TString fname) const
@@ -346 +346 @@
     }
 
-    if (!fOverwrite)
+    if (fOverwrite)
         return kTRUE;