Changeset 887 for trunk

Timestamp:

07/19/01 16:46:47 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MEvtLoop.cc (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (2 diffs)
• mhist/MFillH.cc (added)
• mhist/MFillH.h (added)
• mhist/MFillHFadc.cc (modified) (1 diff)
• mhist/MFillHHillas.cc (modified) (1 diff)
• mhist/MH.cc (added)
• mhist/MH.h (added)
• mhist/MHFadcCam.cc (modified) (2 diffs)
• mhist/MHFadcCam.h (modified) (3 diffs)
• mhist/MHHillas.cc (modified) (1 diff)
• mhist/MHHillas.h (modified) (3 diffs)
• mhist/MHStarMap.cc (modified) (1 diff)
• mhist/MHStarMap.h (modified) (3 diffs)
• mhist/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2001/07/19: Thomas Bretz
+ 
+   * mbase/MEvtLoop.cc:
+     - added comments
+     
+   * mbase/MTaskList.cc:
+     - changed the wrong 'break' for kCONTINUE into 'return kTRUE'
+     
+   * mhist/HistLinkDef.h:
+     - added MH
+     - added MFillH
+     
+   * mhist/MFillHFadc.cc:
+     - moved source for filling to corresponding histogram class
+     
+   * mhist/MFillHHillas.cc:
+     - included MHillas.h
+     
+   * mhist/MHFadcCam.[cc, h]:
+     - added Fill
+     - made FillHi, FillLo private
+     
+   * mhist/MHHillas.[cc, h], mhist/MHStarMap.[h,cc]:
+     - changed Fill function to new style
+     - derived class from MH
+
+   * mhist/Makefile:
+     - added MH.cc
+     - added MFillH.cc
+
+
+
  2001/07/18: Oscar Blanch
-
+ 
    * macros/getRate.C:
      - Macro to compute the trigger rate from a MonteCarlo file
@@ -11 +43 @@
    * mmontecarlo/MMcTriggerRateCalc.[h,cc]:
      - Task to compute trigger rate
+
+
 
  2001/07/13: Thomas Bretz

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -61 +61 @@
 ClassImp(MEvtLoop);
 
+
+//!
+//! Maybe we can add a static parameter list to MEvtLoop
+//! Also we can derive MEvtLoop from MTaskList to have a static tasklist, too
+//!
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -270 +270 @@
             // something occured: skip the rest of the tasks for this event
             //
-            break;
+            return kTRUE;
         }
     }

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
+#pragma link C++ class MH;
 #pragma link C++ class MHFadcCam;
 #pragma link C++ class MHFadcPix;
@@ -14 +15 @@
 #pragma link C++ class MHMcRate;
 
+#pragma link C++ class MFillH;
 #pragma link C++ class MFillHFadc;
 #pragma link C++ class MFillHHillas;

trunk/MagicSoft/Mars/mhist/MFillHFadc.cc

@@ -93 +93 @@
 {
     //  loop over the pixels and fill the values in the histograms
-  
-    MRawEvtPixelIter pixel(fRawEvtData);
-
-    const Int_t nhisamples = fRawEvtData->GetNumHiGainSamples() ;
-    const Int_t nlosamples = fRawEvtData->GetNumLoGainSamples() ;
-
-    while ( pixel.Next() )
-    {
-        const UInt_t id = pixel.GetPixelId();
-
-        for (Int_t i=0;  i<nhisamples; i++)
-            fHistos->FillHi(id, pixel.GetHiGainFadcSamples()[i]);
-
-        if (!pixel.HasLoGain())
-            continue;
-
-        for (Int_t i=0; i<nlosamples; i++)
-            fHistos->FillLo(id, pixel.GetLoGainFadcSamples()[i]);
-    }
-
+    fHistos->Fill(fRawEvtData);
     return kTRUE;
 }

trunk/MagicSoft/Mars/mhist/MFillHHillas.cc

@@ -42 +42 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MHillas.h"
 #include "MHHillas.h"
 #include "MParList.h"

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -36 +36 @@
 #include <TH1.h>
 
+#include "MRawEvtData.h"
+#include "MRawEvtPixelIter.h"
+
 ClassImp(MHFadcCam);
 
@@ -69 +72 @@
 }
 
+void MHFadcCam::Fill(const MParContainer *par)
+{
+    MRawEvtData *evt = (MRawEvtData*)par;
+
+    MRawEvtPixelIter pixel(evt);
+
+    const Int_t nhisamples = evt->GetNumHiGainSamples();
+    const Int_t nlosamples = evt->GetNumLoGainSamples();
+
+    while (pixel.Next())
+    {
+        const UInt_t id = pixel.GetPixelId();
+
+        for (Int_t i=0;  i<nhisamples; i++)
+            FillHi(id, pixel.GetHiGainFadcSamples()[i]);
+
+        if (!pixel.HasLoGain())
+            continue;
+
+        for (Int_t i=0; i<nlosamples; i++)
+            FillLo(id, pixel.GetLoGainFadcSamples()[i]);
+    }
+
+}
 /*void MHFadcCam::SaveHist(char *name)
 {

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -10 +10 @@
 #endif
 
-#ifndef MPARCONTAINER_H
-#include "MParContainer.h"
+#ifndef MH_H
+#include "MH.h"
 #endif
 #ifndef MHFADCPIX_H
@@ -19 +19 @@
 class TH1F;
 
-class MHFadcCam : public MParContainer
+class MHFadcCam : public MH
 {
 private:
     TObjArray *fArray;  // List of Lo/Hi gain Histograms
 
+    void FillHi(UInt_t ipix, Byte_t data) { (*this)[ipix]->FillHi(data); }
+    void FillLo(UInt_t ipix, Byte_t data) { (*this)[ipix]->FillLo(data); }
+
 public:
      MHFadcCam(const char *name=NULL, const char *title=NULL);
     ~MHFadcCam();
-
-    void FillHi(UInt_t ipix, Byte_t data) { (*this)[ipix]->FillHi(data); }
-    void FillLo(UInt_t ipix, Byte_t data) { (*this)[ipix]->FillLo(data); }
 
     //    void SaveHist(char *name);
@@ -37 +37 @@
     TH1F *GetHistHi(UInt_t i)  { return (*this)[i]->GetHistHi(); }
     TH1F *GetHistLo(UInt_t i)  { return (*this)[i]->GetHistLo(); }
+
+    void Fill(const MParContainer *par);
 
     //

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -55 +55 @@
 }
 
-void MHHillas::Fill(const MHillas *par)
+void MHHillas::Fill(const MParContainer *par)
 {
-    fAlpha ->Fill(fabs(par->GetAlpha()));
-    fWidth ->Fill(par->GetWidth());
-    fLength->Fill(par->GetLength());
-    fDist  ->Fill(par->GetDist());
+    MHillas &h = *(MHillas*)par;
+
+    fAlpha ->Fill(fabs(h.GetAlpha()));
+    fWidth ->Fill(h.GetWidth());
+    fLength->Fill(h.GetLength());
+    fDist  ->Fill(h.GetDist());
 }
 

trunk/MagicSoft/Mars/mhist/MHHillas.h

@@ -6 +6 @@
 #endif
 
-#ifndef MPARCONTAINER_H
-#include "MParContainer.h"
+#ifndef MH_H
+#include "MH.h"
 #endif
 
@@ -13 +13 @@
 class MHillas;
 
-class MHHillas : public MParContainer
+class MHHillas : public MH
 {
 private:
@@ -25 +25 @@
     ~MHHillas();
 
-    void Fill(const MHillas *par);
+    void Fill(const MParContainer *par);
 
     TH1F *GetHistAlpha()  { return fAlpha; }

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -133 +133 @@
 }
 
-void MHStarMap::Fill(const MHillas *par)
+void MHStarMap::Fill(const MParContainer *par)
 {
-    const float dist  = par->GetDist();
-    const float theta = par->GetTheta();
-    const float alpha = par->GetAlpha()/kRad2Deg;
+    const MHillas &h = *(MHillas*)par;
+
+    const float dist  = h.GetDist();
+    const float theta = h.GetTheta();
+    const float alpha = h.GetAlpha()/kRad2Deg;
 
     const float m = tan(theta+alpha-kPI);

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -6 +6 @@
 #endif
 
-#ifndef MPARCONTAINER_H
-#include "MParContainer.h"
+#ifndef MH_H
+#include "MH.h"
 #endif
 
@@ -18 +18 @@
 class MHillas;
 
-class MHStarMap : public MParContainer
+class MHStarMap : public MH
 {
 private:
@@ -27 +27 @@
     ~MHStarMap();
 
-    void Fill(const MHillas *par);
+    void Fill(const MParContainer *par);
 
     TH2F *GetHist()               { return fStarMap; }

trunk/MagicSoft/Mars/mhist/Makefile

@@ -28 +28 @@
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
 
-SRCFILES = MFillHFadc.cc \
+SRCFILES = MFillH.cc \
+           MFillHFadc.cc \
            MFillHHillas.cc \
            MFillHStarMap.cc \
+           MH.cc \
            MHFadcPix.cc \
            MHFadcCam.cc \