Changeset 2178 for trunk/MagicSoft/Mars/mraw

Timestamp:

06/16/03 13:45:01 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtData.cc (modified) (6 diffs)
• MRawEvtData.h (modified) (3 diffs)
• MRawEvtPixelIter.cc (modified) (1 diff)
• MRawEvtPixelIter.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -45 +45 @@
 //  --------------------------
 //  see fHiGainFadcSaples
+//
+//
+//   Version 2: Derives from MCamEvent now
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -232 +235 @@
     if (!pix.Jump(id))
     {
-        *fLog << warn << "Pixel Id #" << id << " doesn't exist!" << endl;
+        *fLog << warn << "Pixel Idx #" << id << " doesn't exist!" << endl;
         return;
     }
 
     const Byte_t *higains = pix.GetHiGainSamples();
-
-    const Int_t n = GetNumHiGainSamples();
-
-    TString name = "Pixel No.";
+    const Byte_t *logains = pix.GetLoGainSamples();
+
+    const Int_t nh = GetNumHiGainSamples();
+    const Int_t nl = GetNumLoGainSamples();
+
+    TString name = "Pixel Idx.";
     name += pix.GetPixelId();
 
+    Bool_t same = str.Contains("same", TString::kIgnoreCase);
+
     if (str.BeginsWith("GRAPH", TString::kIgnoreCase))
     {
-        *fLog << inf << "Drawing Graph: Pixel Id #" << pix.GetPixelId();
+        *fLog << inf << "Drawing Graph: Pixel Idx #" << pix.GetPixelId();
         *fLog << " of " << (int)GetNumPixels() << "Pixels" << endl;
 
         TGraph *graph = new TGraph;
 
-        for (int i=0; i<n; i++)
+        for (int i=0; i<nh; i++)
             graph->SetPoint(graph->GetN(), i, higains[i]);
 
@@ -257 +264 @@
 
         graph->SetBit(kCanDelete);
-        graph->Draw("AC*");
+        graph->Draw(same ? "C*" : "AC*");
 
         TH1F *hist = graph->GetHistogram();
@@ -269 +276 @@
     if (str.BeginsWith("HIST", TString::kIgnoreCase))
     {
-        *fLog << "Drawing Histogram of Pixel with Id " << pix.GetPixelId() << endl;
-
-        TH1F *hist = new TH1F(name, "Hi Gain Samples FADC", n, 0, n);
-        hist->SetXTitle("Time/FADC Slices");
-        hist->SetYTitle("Signal/FADC Units");
-
-        for (int i=0; i<n; i++)
-            hist->Fill(0.5+i, higains[i]);
-
-        hist->SetBit(kCanDelete);
-        hist->Draw();
-
+        // FIXME: Add Legend
+        *fLog << "Drawing Histogram of Pixel with Idx " << pix.GetPixelId() << endl;
+
+        TH1F *histh = new TH1F(name, "FADC Samples",      nh, -0.5, nh-.5);
+        histh->SetXTitle("Time [FADC Slices]");
+        histh->SetYTitle("Signal [FADC Units]");
+        histh->SetDirectory(NULL);
+        for (int i=0; i<nh; i++)
+            histh->Fill(i, higains[i]);
+        histh->SetBit(kCanDelete);
+        histh->Draw(same ? "same" : "");
+
+        if (nh>0)
+        {
+            TH1F *histl = new TH1F(name+";2", "FADC Samples", nl, -0.5, nl-.5);
+            histl->SetLineColor(kBlue);
+            histl->SetDirectory(NULL);
+            for (int i=0; i<nl; i++)
+                histl->Fill(i, logains[i]);
+            histl->SetBit(kCanDelete);
+            histl->Draw("same");
+        }
         return;
     }
@@ -447 +464 @@
 }
 
+Bool_t MRawEvtData::GetPixelContent(Float_t &val, Int_t idx, Float_t ratio, Int_t type) const
+{
+    MRawEvtPixelIter Next(const_cast<MRawEvtData*>(this));
+    if (!Next.Jump(idx))
+        return kFALSE;
+
+    val = Next.GetSumHiGainSamples();
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -2 +2 @@
 #define MARS_MRawEvtData
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MCamEvent
+#include "MCamEvent.h"
 #endif
 
@@ -16 +16 @@
 class MArrayB;
 
-class MRawEvtData : public MParContainer
+#include <iostream.h>
+
+class MRawEvtData : public MCamEvent
 {
     friend class MRawEvtPixelIter;
@@ -63 +65 @@
     void ReadEvt(istream &fin);
 
-    ClassDef(MRawEvtData, 1) //Container to store the raw Event Data
+    Bool_t GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const;
+    void   DrawPixelContent(Int_t num) const
+    {
+        TString s("HIST");
+        s += num;
+        const_cast<MRawEvtData*>(this)->Draw(s);
+    }
+
+    ClassDef(MRawEvtData, 2) //Container to store the raw Event Data
 };
 

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -187 +187 @@
 }
 
+Float_t MRawEvtPixelIter::GetVarHiGainSamples() const
+{
+    Byte_t *ptr = fHiGainPos;
+    const Byte_t *end = ptr + fNumHiGainSamples;
+
+    ULong_t sum=0;
+    ULong_t sqsum=0;
+
+    do {
+        sum += *ptr;
+        sqsum += (*ptr)*(*ptr);
+    } while (++ptr != end);
+
+    return (sqsum-(Float_t)sum*sum/fNumHiGainSamples)/(fNumHiGainSamples-1);
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -79 +79 @@
     ULong_t GetSumHiGainSamples() const;
     ULong_t GetSumSqrHiGainSamples() const;
+    Float_t GetVarHiGainSamples() const;
 
     Bool_t HasLoGain() const

trunk/MagicSoft/Mars/mraw/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../MBase
+INCLUDES = -I. -I../mbase -I../MBase -I../mgui
 
 #------------------------------------------------------------------------------