Changeset 2488 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/07/03 19:03:41 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.cc (modified) (1 diff)
• MHEvent.cc (modified) (6 diffs)
• MHEvent.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1144 +1144 @@
          TIter Next(gPad->GetListOfPrimitives());
          TObject *o;
-         while (o=Next()) cout << o->GetName() << " " << o->IsA()->GetName() << endl;
+         while (o=Next()) cout << o << ": " << o->GetName() << " " << o->IsA()->GetName() << endl;
          */
 

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -64 +64 @@
 #include "MRawRunHeader.h"
 #include "MRawEvtData.h"
+#include "MImgCleanStd.h"
 
 ClassImp(MHEvent);
@@ -140 +141 @@
         break;
     case kEvtCleaningLevels:
+        if (!fImgCleanStd)
+        {
+            *fLog << err << "MImgCleanStd not found... aborting." << endl;
+            return kFALSE;
+        }
         fHist->SetName("CleanLevels");
         fHist->SetYTitle("L");
-        if (!fImgCleanStd)
-            return kFALSE;
         break;
     }
@@ -171 +175 @@
         break;
     case kEvtRelativeSignal:
+        fHist->SetCamContent(*(MCamEvent*)par, 0);
+        break;
     case kEvtCleaningLevels:
-        fHist->SetCamContent(*(MCamEvent*)par, 0);
+        {
+            TArrayF lvl(2);
+            lvl[0] = fImgCleanStd->GetCleanLvl2();
+            lvl[1] = fImgCleanStd->GetCleanLvl1();
+            fHist->SetCamContent(*(MCamEvent*)par, 0);
+            fHist->SetLevels(lvl);
+        }
         break;
     }
@@ -193 +205 @@
     if (fMcEvt)
     {
-        TString txt;// = "#splitline{";
+        TString txt("#splitline{");
 
         switch (fMcEvt->GetPartId())
@@ -214 +226 @@
         s.Insert(0, txt);
 
-        //s += "}{";
+        s += "}{";
         s += "  E=";
         if (fMcEvt->GetEnergy()>1000)
@@ -224 +236 @@
         s += "m ZA=";
         s += (int)(fMcEvt->GetTheta()*180/TMath::Pi()+.5);
-        s += "° ";
+        s += "\xb0 ";
         s += fMcEvt->GetPhotElfromShower();
         s += "PhEl";
-        //s += "}";
+        s += "}";
     }
 

trunk/MagicSoft/Mars/mhist/MHEvent.h

@@ -15 +15 @@
 class MPedestalCam;
 class MImgCleanStd;
-class MRelSignal;
+class MCameraSignal;
 
 class MHEvent : public MH
@@ -34 +34 @@
     MPedestalCam  *fPedestalCam;   //!
     MImgCleanStd  *fImgCleanStd;   //!
+    MCameraSignal *fCamSignal;     //!
 
     MRawEvtData   *fClone;         //->