Changeset 953 for trunk/MagicSoft

Timestamp:

09/27/01 15:15:25 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhist/MFillH.cc (modified) (2 diffs)
• mmain/MAnalysis.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
      - added entry field for cleaning levels
      - restructured code a bit
+
+   * mhist/MFillH.cc:
+     - fixed missing initialization of member variables in Init
 
    * mhist/MHHillas.[h,cc]:
@@ -14 +17 @@
      - Added DrawClone
      - Removed kCanDelete bits from Draw function
-     
+
    * mhist/MHStarMap.[h,cc]:
      - Added comments

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -62 +62 @@
     *fName  = name  ? name  : "MFillH";
     *fTitle = title ? title : "Task to fill Mars histograms";
+
+    fH            = NULL;
+    fParContainer = NULL;
 }
 
@@ -160 +163 @@
 
     return kTRUE;
-} 
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -165 +165 @@
 // ======================================================================
 
+#include "MLog.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -178 +179 @@
 #include "MEvtLoop.h"
 #include "MHillas.h"
-
+#include <iostream.h>
 void MAnalysis::CalculateHillas() const
 {
@@ -212 +213 @@
     plist.AddToList(&tlist);
 
+
     //
     // The geometry container must be created by yourself to make sure
@@ -221 +223 @@
     MPedestalCam pedest;
     plist.AddToList(&pedest);
-
-    //
-    // The Hillas histograms (MHHillas) could be created automatically
-    // but to make sure, that they are not deleted when the macro is
-    // finished you must create them yourself and add it to the list
-    //
-    MHillas hillas;
-    plist.AddToList(&hillas);
-
-    MHHillas  hists;
-    MHStarMap smap;
-    plist.AddToList(&hists);
-    plist.AddToList(&smap);
 
     //
@@ -261 +250 @@
     tlist.AddToList(&hcalc);
 
-    MFillH hfill(&hillas, &hists);
-    MFillH sfill(&hillas, &smap);
+    MFillH hfill("MHillas", "MHHillas");
+    MFillH sfill("MHillas", "MHStarMap");
 
     if (displhillas)
@@ -286 +275 @@
     //
     if (displhillas)
-        hists.DrawClone();
+        plist.FindObject("MHHillas")->DrawClone();
 
     if (displstarmap)
-        smap.DrawClone();
+        plist.FindObject("MHStarMap")->DrawClone();
 
     cout << endl;