Changeset 2142 for trunk/MagicSoft/Mars

Timestamp:

05/27/03 16:02:28 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• mbase/MLogManip.h (modified) (1 diff)
• mimage/MHNewImagePar.cc (modified) (1 diff)
• mmain/MAnalysis.cc (modified) (1 diff)
• mreflector/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
-
  2003/05/26: Wolfgang Wittek
 
@@ -7 +6 @@
                          continue;
  
-   * Manalysis/MPadSchweizer.cc
+   * manalysis/MPadSchweizer.cc
      - add pixels to MCerPhotEvt which are not yet in;
        set their number of photons equal to zero
@@ -13 +12 @@
 
 
- 2003/05/23: Abelardo Moralejo
+ 2003/05/27: Thomas Bretz
 
    * mreflector/Makefile:
-     added (was missing)
+     - removed obsolete includes
+
+   * mbase/MLogManip.h:
+     - for the moment removed dbg<< from dbginf again
+
+   * mimage/MHNewImagePar.cc:
+     - security check in fill
+
+   * mmain/MAnalysis.cc:
+     - fixed filling of MHNewImagePar
+
+
 
  2003/05/26: Thomas Bretz
@@ -25 +35 @@
    * manalysis/MMcPedestalNSBAdd.cc:
      - fixed a typo (* instead of /)
+
+
+
+ 2003/05/23: Abelardo Moralejo
+
+   * mreflector/Makefile:
+     - added (was missing)
 
 

trunk/MagicSoft/Mars/mbase/MLogManip.h

@@ -56 +56 @@
 //
 #ifndef __CINT__
-#define dbginf dbg << __FILE__ << " l." << dec << __LINE__ << ": "
+//#define dbginf dbg << __FILE__ << " l." << dec << __LINE__ << ": "
+#define dbginf __FILE__ << " l." << dec << __LINE__ << ": "
 #define all    debug(0) // use this for output in any case
 #define err    debug(1) // use this for fatal errors (red)

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -144 +144 @@
 Bool_t MHNewImagePar::Fill(const MParContainer *par, const Stat_t w)
 {
+    if (!par)
+    {
+        *fLog << err << "MHNewImagePar::Fill: Pointer (!=NULL) expected." << endl;
+        return kFALSE;
+    }
+
     const MNewImagePar &h = *(MNewImagePar*)par;
 

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -203 +203 @@
      */
 
-    MFillH hfill("MHHillas",      "MHillas");
-    MFillH hfill2("MHHillasExt",  "MHillasSrc");
-    MFillH hfill2s("MHHillasSrc", "MHillasSrc");
-    MFillH hfill3("MHNewImagePar");
-    MFillH sfill("MHStarMap",     "MHillas");
+    MFillH hfill("MHHillas",       "MHillas");
+    MFillH hfill2("MHHillasExt",   "MHillasSrc");
+    MFillH hfill2s("MHHillasSrc",  "MHillasSrc");
+    MFillH hfill3("MHNewImagePar", "MNewImagePar");
+    MFillH sfill("MHStarMap",      "MHillas");
     /*
      MFillH hfill2s("HistSource  [MHHillasSrc]", "HillasSource");

trunk/MagicSoft/Mars/mreflector/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgeom -I../manalysis -I../mimage -I../mhist
+INCLUDES = -I. -I../mbase
 
 #------------------------------------------------------------------------------