Changeset 1948

Timestamp:

04/12/03 13:53:43 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MCT1SupercutsCalc.cc (modified) (1 diff)
• mbase/MFilter.h (modified) (1 diff)
• mhist/MHHadronness.cc (modified) (1 diff)
• mhist/MHMatrix.cc (modified) (2 diffs)
• mhist/MHMatrix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/12: Wolfgang Wittek
+
+   * mbase/MFilter.h
+     - set ClassDef(MFilter,1)
+
+   * mhist/MHHadronness.[h,cc]
+     - improve warning printout
+
+   * mhist/MHMatrix.[h,cc]
+     - type of 3rd argument of member function Fill
+       changed from 'MF' to 'MFilter'
+
 
  2003/04/11: Thomas Bretz
@@ -140 +153 @@
 
    * manalysis/MMultiDimDistCalc.[h,cc]
-     - swap arguments if FindCreateObj
+     - swap arguments in FindCreateObj
 
 

trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc

@@ -289 +289 @@
   fHadronness->SetReadyToSave();
 
+  fHadronness->SetReadyToSave();
+
   return kTRUE;
 }

trunk/MagicSoft/Mars/mbase/MFilter.h

@@ -25 +25 @@
     Bool_t IsInverted() const  { return fInverted; }
 
-    ClassDef(MFilter, 0)                // Abstract base class for the filters
+    ClassDef(MFilter, 1)                // Abstract base class for the filters
 };
 

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -253 +253 @@
     *fLog << inf << "MHHadronness::Finalize - Sum Hadronness: gammas=" << sumg << " hadrons=" << sump << endl;
 
-    if (sumg==0 || sump==0)
-        *fLog << warn << "MHHadronness::Finalize: Cannot calculate hadronness." << endl;
+    if (sumg==0 )
+        *fLog << warn << "MHHadronness::Finalize: Cannot calculate hadronness for 'gammas'." << endl;
+    if (sump==0)
+        *fLog << warn << "MHHadronness::Finalize: Cannot calculate hadronness for 'hadrons'." << endl;
 
 

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -68 +68 @@
 #include "MData.h"
 #include "MDataArray.h"
-#include "MF.h"
+#include "MFilter.h"
 
 
@@ -600 +600 @@
 // --------------------------------------------------------------------------
 //
-Bool_t MHMatrix::Fill(MParList *plist, MTask *read, MF *filter)
+Bool_t MHMatrix::Fill(MParList *plist, MTask *read, MFilter *filter)
 {
     //

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -22 +22 @@
 class MParList;
 class MDataArray;
-class MF;
+class MFilter;
 
 class MHMatrix : public MH
@@ -98 +98 @@
     Double_t operator[](Int_t col) { return fM(fRow, col); }
 
-    Bool_t Fill(MParList *plist, MTask *read, MF *filter=NULL);
+    Bool_t Fill(MParList *plist, MTask *read, MFilter *filter=NULL);
 
     TString GetDataMember() const;