Changeset 2979 for trunk

Timestamp:

01/30/04 10:49:33 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mbase/MDirIter.h (modified) (1 diff)
• mhist/MHEvent.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/01/30: Thomas Bretz
+ 
+   * mbase/MDirIter.h:
+     - added GetNumEntries
+
+   * mhist/MHEvent.cc:
+     - added a dynamic_cast from MParContainer to MCamEvent to get the
+       correct pointer to the correct base-class.
+
+
+
  2004/01/30: Markus Gaug
 
@@ -12 +23 @@
      - modified GetPixelContent
 
-   * manalysis/MPedestalCam.cc
-   * manalysis/MPedCalcPedRun.cc
+   * manalysis/MPedestalCam.cc, manalysis/MPedCalcPedRun.cc:
      - include storage of number of used FADC slices to compare later 
        the pedestal per slice ( and sigma per slice_
@@ -32 +42 @@
        and displays of errors, correction for different FADC slice 
        number)
+
 
 

trunk/MagicSoft/Mars/mbase/MDirIter.h

@@ -59 +59 @@
 
     void SetFilter(const char *f="") { fFilter = f; }
+    UInt_t GetNumEntries() const
+    {
+        UInt_t n = 0;
+        MDirIter Next(*this);
+        while (!Next().IsNull()) n++;
+        return n;
+    }
 
     void Print(const Option_t *o="") const;

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -170 +170 @@
         return kFALSE;
 
+    const MCamEvent *event = dynamic_cast<const MCamEvent*>(par);
+    if (!event)
+    {
+        *fLog << err << par->GetDescriptor() << " doesn't inherit from MCamEvent... abort." << endl;
+        return kFALSE;
+    }
+
     if (fRawEvtData)
         fRawEvtData->Copy(*fClone);
@@ -177 +184 @@
     case kEvtSignal:
     case kEvtPedestal:
-        fHist->SetCamContent(*(MCamEvent*)par, 0);
+        fHist->SetCamContent(*event, 0);
         break;
     case kEvtPedestalRMS:
-        fHist->SetCamContent(*(MCamEvent*)par, 1);
+        fHist->SetCamContent(*event, 1);
         break;
     case kEvtRelativeSignal:
-        fHist->SetCamContent(*(MCamEvent*)par, 0);
+        fHist->SetCamContent(*event, 0);
         break;
     case kEvtCleaningLevels:
@@ -190 +197 @@
             lvl[0] = fImgCleanStd->GetCleanLvl2();
             lvl[1] = fImgCleanStd->GetCleanLvl1();
-            fHist->SetCamContent(*(MCamEvent*)par, 0);
+            fHist->SetCamContent(*event, 0);
             fHist->SetLevels(lvl);
         }
         break;
     case kEvtIdxMax:
-        fHist->SetCamContent(*(MCamEvent*)par, 5);
+        fHist->SetCamContent(*event, 5);
         break;
     case kEvtArrTime:
-        fHist->SetCamContent(*(MCamEvent*)par, 0);
+        fHist->SetCamContent(*event, 0);
         break; 
     }