Changeset 1660 for trunk/MagicSoft

Timestamp:

11/21/02 10:28:46 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/collarea.C (modified) (2 diffs)
• manalysis/MMultiDimDistCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
    * mbase/MAGIC.h, mbase/MEvtLoop.[h,cc], MTask.cc, MTaskList.cc:
      - introduced kERROR to stop an eventloop with an error
+
+   * manalysis/MMultiDimDistCalc.cc:
+     - introduced usage of kERROR in case the matrix is not posdef.
 
    * macros/collarea.C:

trunk/MagicSoft/Mars/macros/collarea.C

@@ -24 +24 @@
 
 
-void collarea(char *filename = "data/camera.root", char *outname = "")
+void collarea(TString filename="camera.root", TString outname="")
 { 
     //
@@ -68 +68 @@
 
 
-    // Write histogram to a file in case an output filename has been supplied:
+    //
+    // Write histogram to a file in case an output
+    // filename has been supplied
+    //
+    if (outname.IsNull())
+        return;
 
-    if (strlen(outname) > 0)
-      {
-        TFile* f = new TFile(outname,"recreate");
-        if (f)
-          {
-            TH1D* hc = ((MHMcCollectionArea*)parlist.FindObject("MHMcCollectionArea"))->GetHist();
-            hc->Write();
-            f.Close();
-          }
-      }
+    TFile f(outname, "recreate");
+    if (!f)
+        return;
+
+    parlist.FindObject("MHMcCollectionArea")->Write();
 }

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -205 +205 @@
     {
         *fLog << err << "MHMatrix::CalcDist failed (dg=" << dg << ", dh=" << dh << ")... aborting" << endl;
-        return kFALSE;
+        return kERROR;
     }