Changeset 2178

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/readCT1.C (modified) (2 diffs)
• macros/readMagic.C (modified) (2 diffs)
• macros/readcurrents.C (modified) (2 diffs)
• macros/sumcurrents.C (modified) (2 diffs)
• manalysis/MCerPhotCalc.cc (modified) (4 diffs)
• manalysis/MCerPhotCalc.h (modified) (1 diff)
• manalysis/MCerPhotEvt.cc (modified) (1 diff)
• manalysis/MCerPhotEvt.h (modified) (3 diffs)
• manalysis/MCurrents.h (modified) (3 diffs)
• manalysis/MMcPedestalNSBAdd.cc (modified) (1 diff)
• manalysis/MPedestalCam.cc (modified) (1 diff)
• manalysis/MPedestalCam.h (modified) (3 diffs)
• mbase/BaseLinkDef.h (modified) (1 diff)
• mbase/MDirIter.cc (added)
• mbase/MDirIter.h (added)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MTaskInteractive.cc (modified) (2 diffs)
• mbase/MTaskList.cc (modified) (4 diffs)
• mbase/Makefile (modified) (1 diff)
• merpp.cc (modified) (2 diffs)
• meventdisp/MGCamDisplay.cc (modified) (4 diffs)
• mfileio/Makefile (modified) (1 diff)
• mgeom/MGeomPix.cc (modified) (2 diffs)
• mgui/GuiLinkDef.h (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (13 diffs)
• mgui/MCamDisplay.h (modified) (6 diffs)
• mgui/MCamEvent.cc (added)
• mgui/MCamEvent.h (added)
• mgui/Makefile (modified) (2 diffs)
• mhist/MFillH.cc (modified) (1 diff)
• mhist/MHCerPhotEvt.cc (modified) (3 diffs)
• mhist/MHCurrents.cc (modified) (9 diffs)
• mhist/MHCurrents.h (modified) (3 diffs)
• mmain/MStatusDisplay.cc (modified) (8 diffs)
• mmain/MStatusDisplay.h (modified) (4 diffs)
• mraw/MRawEvtData.cc (modified) (6 diffs)
• mraw/MRawEvtData.h (modified) (3 diffs)
• mraw/MRawEvtPixelIter.cc (modified) (1 diff)
• mraw/MRawEvtPixelIter.h (modified) (1 diff)
• mraw/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -5 +5 @@
    * mhist/MHOnSubtraction.cc:
      - worked around the non compiling source file
+
+   * merpp.cc:
+     - set compression level default = 1
+
+   * macros/readCT1.C, macros/readMagic.C, macros/readcurrents.C,
+     meventdisp/MGCamDisplay.cc
+     - adapted to new MCamDisplay and MCamEvent
+
+   * macros/sumcurrents.C:
+     - enhanced
+
+   * manalysis/MCerPhotCalc.[h, cc]:
+     - simplified algorithm
+
+   * manalysis/MCerPhotEvt.[h,cc], manalysis/MCurrents.[h,cc],
+     manalysis/MPedestalCam.[h,cc]:
+     - derived from MCamEvent
+     
+   * manalysis/MMcPedestalNSBAdd.cc:
+     - minor change
+     
+   * mbase/BaseLinkDef.h, mbase/Makefile:
+     - added MDirIter
+
+   * mbase/MDirIter.[h,cc]:
+     - added
+     
+   * mbase/MParList.cc:
+     - enhnced some output
+
+   * mbase/MTaskInteractive.cc:
+     - fixed a bug
+     
+   * mbase/MTaskList.cc:
+     - added handling of gui events for Pre- and PostProcess
+     
+   * mgeom/MGeomPix.cc:
+     - added a comment
+     
+   * mgui/MCamDisplay.[h,cc] -  PRELIMINARY:
+     - added a notification list
+     - fixed SetRange if pad is not the main pad
+     - new Fill functions using MCamEvent, removed old ones 
+     
+   * mhist/MFillH.cc:
+     - check for the existance of the canvas
+     
+   * mhist/MHCerPhotEvt.cc:
+     - take usage of MCamEvent
+
+   * mhist/MHCurrents.cc:
+     - take usage of MCamEvent
+     - added rms
+     
+   * mmain/MStatusDisplay.[h,cc]:
+     - added "Reset" and "Remove Tab" to menu bar
+
+   * mraw/MRawEvtData.[h,cc]:
+     - draw hi- and logains
+     - derived from MCamEvent
+     
+   * mraw/MRawEvtPixelIter.[h,cc]:
+     - added GetVarHiGainSamples
+
+   * mraw/Makefile:
+     - added -I../mgui - PRELIMINARY
 
 

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -89 +89 @@
             continue;
 
-        display.FillPhotNum(*evt);
+        display.Fill(*evt);
         display.Update();
 
@@ -100 +100 @@
         newimgpar.Print();
 
-        display.FillPhotNum(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+        display.Fill(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
         display.Update();
 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -104 +104 @@
         cout << "Event #" << read.GetNumEntry() ":" << endl;
 
-        display.FillPhotNum(*(MCerPhotEvt*)clone.GetClone());
+        display.Fill(*(MCerPhotEvt*)clone.GetClone());
         gPad->Modified();
         gPad->Update();
@@ -116 +116 @@
         newimgpar.Print();
 
-        display.FillPhotNum(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+        display.Fill(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/macros/readcurrents.C

@@ -45 +45 @@
 }
 
-void readcurrents(const char *fname="../currents/dcs_vega.dat")
+void readcurrents(const char *fname="../currents/dcs_arcturus.dat")
 {
     MParList plist;
@@ -86 +86 @@
     {
         // cur.Print();
-        display.FillCurrents(cur);
+        display.Fill(cur);
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/macros/sumcurrents.C

@@ -29 +29 @@
 //  This macro shows how to fill and display a histogram using Mars
 //
-void sumcurrents(const char *fname="../currents/dcs_arcturus.dat")
+void sumcurrents(const char *fname="../currents/spica_center.txt")
 {
     //
@@ -83 +83 @@
     MHCurrents &h = *(MHCurrents*)plist->FindObject("MHCurrents");
 
-    MCamDisplay *disp = new MCamDisplay(&geom);
-    disp->FillCurrents(h.GetSum());
-    disp->Draw();
+    TCanvas *c = MH::MakeDefCanvas();
+    c->Divide(3, 2);
+
+    MCamDisplay *disp1=new MCamDisplay(&geom);
+    MCamDisplay *disp2=new MCamDisplay(&geom);
+    MCamDisplay *disp3=new MCamDisplay(&geom);
+    disp1->Fill(h.GetSum());
+    disp2->Fill(h.GetRms());
+
+    TArrayF arr(577);
+    for (int i=0;i<577;i++)
+    {
+        TArrayF &r = h.GetRms();
+        TArrayF &v = h.GetSum();
+        arr[i] = (r[i]==0 ? 0 : v[i]/r[i]);
+    }
+    disp3->Fill(arr);
+
+    c->cd(1);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetLogz();
+    disp1->Draw();
+    disp1->SetBit(kCanDelete);
+    c->cd(2);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetLogz();
+    disp2->Draw();
+    disp2->SetBit(kCanDelete);
+    c->cd(3);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetLogz();
+    disp3->Draw();
+    disp3->SetBit(kCanDelete);
+    c->cd(4);
+    gPad->SetBorderMode(0);
+    h.GetHist().DrawClone();
+    c->cd(5);
+    gPad->SetBorderMode(0);
+    TH1F h1("currents;rms", "Currents Rms", 577, -0.5, 576.5);
+    for (int i=1;i<=577; i++)
+        h1.SetBinContent(i, h.GetHist().GetBinError(i));
+    h1.DrawCopy();
+    c->cd(6);
+    gPad->SetBorderMode(0);
+    TH1F h2("currents;relerr", "Currents rel. Error [%]", 577, -0.5, 576.5);
+    for (int i=1;i<=577; i++)
+    {
+        Float_t val = h.GetHist().GetBinContent(i);
+        Float_t rms = h.GetHist().GetBinError(i);
+        h2.SetBinContent(i, rms==0?0:val/rms);
+    }
+    h2.DrawCopy();
+
+    c->SaveAs("spica_center-avg.ps");
 }

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -32 +32 @@
 //   the array fWeight (default: all slices added up with weight 1).
 //
+//   The weights are rescaled, such that sum(weigths)=num slices
+//
 //  Input Containers:
 //   MRawRunHeader, MRawEvtData, MPedestalCam
@@ -112 +114 @@
 
     // Calculate quadratic sum of weights:
-    fSumQuadWeights = 0.;
-    for (Int_t i = 0; i < fWeight.GetSize(); i++)
+    fSumWeights = 0;
+    fSumQuadWeights = 0;
+    for (Int_t i=0; i<fWeight.GetSize(); i++)
+    {
+        fSumWeights += fWeight[i];
         fSumQuadWeights += fWeight[i]*fWeight[i];
+    }
 
     fSumQuadWeights = sqrt(fSumQuadWeights);
@@ -169 +175 @@
 
     MRawEvtPixelIter pixel(fRawEvt);
-
-    TArrayF binsignal(fWeight.GetSize());
 
     while (pixel.Next())
@@ -194 +198 @@
         // Calculate pixel signal unless it has all FADC slices empty:
         //
-        const Byte_t *ptr = pixel.GetHiGainSamples();
-
-        Float_t nphot = 0;
-        Float_t nphoterr = 0;
-
-        if (pixel.GetSumHiGainSamples()>0)
-        {
-            for (Int_t i=0; i<fWeight.GetSize(); i++)
-            {
-                binsignal[i] =  ptr[i] - mean;
-                nphot       +=  binsignal[i] * fWeight[i];
-            }
-            nphoterr = ped.GetSigma() * fSumQuadWeights;
-        }
+        Byte_t *ptr = pixel.GetHiGainSamples();
+
+        Float_t nphot = 0;
+        for(Int_t i=0; i<fWeight.GetSize(); i++)
+            nphot += ptr[i]*fWeight[i];
+
+        nphot -= mean*fSumWeights;
+
+        const Float_t nphoterr = ped.GetSigma()* fSumQuadWeights;
 
         fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h

@@ -33 +33 @@
 
     TArrayF         fWeight;  // Weights for adding up the ADC slices
+    Float_t         fSumWeights;
     Float_t         fSumQuadWeights;
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -384 +384 @@
     fNumPixels=fPixels->GetEntriesFast();
 }
+
+Bool_t MCerPhotEvt::GetPixelContent(Float_t &val, Int_t idx, Float_t ratio, Int_t type) const
+{
+    MCerPhotPix *pix = GetPixById(idx);
+    if (!pix || !pix->IsPixelUsed())
+        return kFALSE;
+
+    switch (type)
+    {
+    case 1:
+        val = pix->GetErrorPhot()*TMath::Sqrt(ratio);
+        return kTRUE;
+    case 2:
+        if (pix->GetErrorPhot()<=0)
+            return kFALSE;
+        val = pix->GetNumPhotons()*TMath::Sqrt(ratio)/pix->GetErrorPhot();
+        return kTRUE;
+    default:
+        val = pix->GetNumPhotons()*ratio;
+        return kTRUE;
+    }
+    return kTRUE;
+}

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -4 +4 @@
 #ifndef ROOT_TClonesArray
 #include <TClonesArray.h>
+#endif
+#ifndef MARS_MCamEvent
+#include "MCamEvent.h"
 #endif
 #ifndef MARS_MCerPhotPix
@@ -12 +15 @@
 class MCerPhotPix;
 
-class MCerPhotEvt : public MParContainer
+class MCerPhotEvt : public MCamEvent
 {
 private:
@@ -61 +64 @@
     void Clear(Option_t *opt=NULL) { Reset(); }
 
+    Bool_t GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const;
+    void DrawPixelContent(Int_t num) const
+    {
+    }
+
     ClassDef(MCerPhotEvt, 1)    // class for an event containing cerenkov photons
 };

trunk/MagicSoft/Mars/manalysis/MCurrents.h

@@ -2 +2 @@
 #define MARS_MCurrents
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MCamEvent
+#include "MCamEvent.h"
 #endif
 
@@ -10 +10 @@
 #endif
 
-class MCurrents : public MParContainer
+#include <iostream.h>
+class MCurrents : public MCamEvent
 {
 private:
@@ -37 +38 @@
     void Print(Option_t *opt=NULL) const;
 
+    Bool_t GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const
+    {
+        val = (*this)[idx];
+        return val>0;
+    }
+    void DrawPixelContent(Int_t num) const
+    {
+    }
+
     ClassDef(MCurrents, 1) // Storage Container for the Currents (PRELIMINARY)
 };

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Oscar Blanch  11/2001 < mailto:blanch@ifae.es>
+!   Author(s): Oscar Blanch, 11/2001 <mailto:blanch@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2001

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -181 +181 @@
     return maxval;
 }
+
+Bool_t MPedestalCam::GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const
+{
+    val = (*this)[idx].GetMean()*ratio;
+    return kTRUE;
+}

trunk/MagicSoft/Mars/manalysis/MPedestalCam.h

@@ -2 +2 @@
 #define MARS_MPedestalCam
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MCamEvent
+#include "MCamEvent.h"
 #endif
 
@@ -11 +11 @@
 class MPedestalPix;
 
-class MPedestalCam : public MParContainer
+class MPedestalCam : public MCamEvent
 {
 private:
@@ -35 +35 @@
     void Print(Option_t *o="") const;
 
+    Bool_t GetPixelContent(Float_t &val, Int_t idx, Float_t ratio=1, Int_t type=0) const;
+    void DrawPixelContent(Int_t num) const
+    {
+    }
+
     ClassDef(MPedestalCam, 1)   // Storage Container for all pedestal information of the camera
 };

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -16 +16 @@
 
 #pragma link C++ class MIter+;
+#pragma link C++ class MDirIter+;
 
 #pragma link C++ class MTask+;

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -472 +472 @@
     if (!pcont)
     {
-        *fLog << err << dbginf << "Cannot create new instance of class '" << cname << "' (Maybe no def. constructor)" << endl;
+        *fLog << err << dbginf << "Cannot create new instance of class '" << cname << "' Possible reasons:" << endl;
+        *fLog << " - Class has no default constructor." << endl;
+        *fLog << " - An abstract member functions of a base class is not overwritten." << endl;
         return NULL;
     }

trunk/MagicSoft/Mars/mbase/MTaskInteractive.cc

@@ -26 +26 @@
 //
 // MTaskInteractive
+//
+// If you want to create a new task inside a macro you will have to compile
+// your macro using macro.C++, because the root interpreter cannot use
+// uncompiled classes. To workaround this problem you can write simple
+// funcions (which can be handled by CINT) and use MTaskInteractive.
+//
+// This is a simple way to develop new code in a macro without need
+// to compile it.
 //
 //  Input Containers:
@@ -77 +85 @@
 
     Long_t result;
-    fCall[no]->Execute(params, result);
+    fCall[no]->SetParamPtrs(params);
+    fCall[no]->Execute(result);
+
     return result;
 }

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -60 +60 @@
 
 #include <TClass.h>
+#include <TSystem.h>        // gSystem
 #include <TOrdCollection.h>
 
@@ -365 +366 @@
 
         case kTRUE:
+            // Handle GUI events (display changes, mouse clicks)
+            if (fDisplay)
+                gSystem->ProcessEvents();
             continue;
 
@@ -461 +465 @@
             //
             rc = kFALSE;
+            *fLog << inf << task->GetDescriptor() << " has stopped execution of " << GetDescriptor() << "." << endl;
             break;
 
@@ -531 +536 @@
         if (!task->CallPostProcess())
             return kFALSE;
+
+        // Handle GUI events (display changes, mouse clicks)
+        if (fDisplay)
+            gSystem->ProcessEvents();
     }
 

trunk/MagicSoft/Mars/mbase/Makefile

@@ -43 +43 @@
            MEvtLoop.cc \
            MIter.cc \
+           MDirIter.cc \
            MGList.cc \
            MGTask.cc \

trunk/MagicSoft/Mars/merpp.cc

@@ -53 +53 @@
         gLog << "     input file:   Magic DAQ binary file." << endl;
         gLog << "     ouput file:   Merpped root file." << endl;
-        gLog << "     compr. level: 1..9 [default=9]" << endl << endl;
+        gLog << "     compr. level: 1..9 [default=1]" << endl << endl;
         return -1;
     }
@@ -67 +67 @@
     const char *kNamein   = argv[1];
     const char *kNameout  = argv[2];
-    const int   kComprlvl = argc==4 ? atoi(argv[3]) : 9;
+    const int   kComprlvl = argc==4 ? atoi(argv[3]) : 1;
 
     //

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -46 +46 @@
 #include "MImgCleanStd.h"        // MImgCleanStd
 #include "MGeomCamMagic.h"       // MGeomMagicCam
+#include "MRawEvtData.h"         // MRawEvtData
 
 ClassImp(MGCamDisplay);
@@ -137 +138 @@
     MGeomCamMagic *geom   = new MGeomCamMagic;
     MPedestalCam  *pedest = new MPedestalCam;
+    MRawEvtData   *event  = new MRawEvtData;
 
     plist->AddToList(geom);
     plist->AddToList(pedest);
+    plist->AddToList(event);
 
     return geom;
@@ -176 +179 @@
         fDisplay[i]  = new MCamDisplay(geom);
         fDisplay[i]->Draw();
+        fDisplay[i]->AddNotify(*(MCamEvent*)GetParList()->FindObject("MRawEvtData"));
         fCanvas2[i]->Update();
         fList->Add(fDisplay[i]);
@@ -245 +249 @@
     const MPedestalCam *ped   = (MPedestalCam*)plist->FindObject("MPedestalCam");
 
-    fDisplay[0]->FillPhotNum(*evt);
-    fDisplay[1]->FillErrorPhot(*evt);
-    fDisplay[2]->FillRatio(*evt);
+    fDisplay[0]->Fill((MCamEvent&)*evt, 0);
+    fDisplay[1]->Fill((MCamEvent&)*evt, 1);
+    fDisplay[2]->Fill((MCamEvent&)*evt, 2);
     fDisplay[3]->FillLevels(*evt, *clean);
-    fDisplay[4]->FillPedestals(*ped);
+    fDisplay[4]->Fill((MCamEvent&)*ped);
 
     for (int i=0; i<5; i++)

trunk/MagicSoft/Mars/mfileio/Makefile

@@ -21 +21 @@
 
 INCLUDES = -I. -I../mbase -I../mraw -I../mmc -I../mdata -I../manalysis \
-           -I../mgeom -I../mhist -I../mmain -I../mreflector
+           -I../mgeom -I../mhist -I../mmain -I../mreflector -I../mgui
 
 # @code 

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !   Author(s): Harald Kornmayer 1/2001
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -35 +35 @@
 // MGeomPix.
 //
+// FIXME: According to an agreement we have to change the name 'Id'
+//        to 'idx'
+//
 ////////////////////////////////////////////////////////////////////////////
-
 #include "MGeomPix.h"
 

trunk/MagicSoft/Mars/mgui/GuiLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MHexagon+;
+#pragma link C++ class MCamEvent+;
 #pragma link C++ class MCamDisplay+;
 

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -63 +63 @@
 
 #include "MCurrents.h"
+#include "MCamEvent.h"
 
 #include "MImgCleanStd.h"
@@ -91 +92 @@
     fMinimum = 0;
     fMaximum = 1;
+
+    fNotify = new TList;
 }
 
@@ -101 +104 @@
 {
     fGeomCam = (MGeomCam*)geom->Clone(); 
+
+    fNotify = new TList;
 
     //
@@ -211 +216 @@
 
     delete fGeomCam;
+
+    delete fNotify;
 }
 
@@ -228 +235 @@
     pad->SetBorderMode(0);
     pad->SetFillColor(16);
-
+    //pad->Modified();
+    /*
+    pad->Divide(1,1);
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+    gPad->SetFillColor(16);
+*/
     AppendPad("");
 }
@@ -240 +253 @@
     const float ratio = 1.15;
 
-    const float w = gPad->GetWw();
-    const float h = gPad->GetWh()*ratio;
-
+    //
+    // Calculate width and height of the current pad in pixels
+    //
+    Float_t w = gPad->GetWw();
+    Float_t h = gPad->GetWh()*ratio;
+
+    //
+    // This prevents the pad from resizing itself wrongly
+    //
+    if (gPad->GetMother() != gPad)
+    {
+        w *= gPad->GetMother()->GetAbsWNDC();
+        h *= gPad->GetMother()->GetAbsHNDC();
+    }
+
+    //
+    // Set Range (coordinate system) of pad
+    //
     gPad->Range(-fRange, -fRange, (2*ratio-1)*fRange, fRange);
 
+    //
+    // Resize Pad to given ratio
+    //
     if (h<w)
-        gPad->SetPad((1.-h/w)/2, 0, (h/w+1)/2, 0.9999999);
+        gPad->SetPad((1.-h/w)/2, 0, (h/w+1.)/2, 1);
     else
-        gPad->SetPad(0, (1.-w/h)/2, 1, (w/h+1)/2);
+        gPad->SetPad(0, (1.-w/h)/2, 1, (w/h+1.)/2);
 }
 
@@ -271 +302 @@
     }
 
+    if (fMinimum==FLT_MAX && fMaximum==-FLT_MAX)
+        fMinimum = fMaximum = 0;
     if (fMinimum==fMaximum)
         fMaximum = fMinimum + 1;
@@ -282 +315 @@
         else
             (*this)[i].SetFillColor(10);
-
     }
 }
@@ -314 +346 @@
 
     // Paint primitives (pixels, color legend, photons, ...)
-    { fPixels->ForEach(TObject, Paint)(); }
-    { fLegend->ForEach(TObject, Paint)(); }
+    { fPixels->ForEach( TObject, Paint)(); }
+    { fLegend->ForEach( TObject, Paint)(); }
     { fLegText->ForEach(TObject, Paint)(); }
     { fPhotons->ForEach(TObject, Paint)(); }
@@ -445 +477 @@
 // ------------------------------------------------------------------------
 //
-// Call this function to fill the number of photo electron into the
-// camera.
-//
-void MCamDisplay::FillPhotNum(const MCerPhotEvt &event)
+// Call this function to fill the currents
+//
+void MCamDisplay::Fill(const MCamEvent &event, Int_t type)
 {
     Reset();
 
-    const Int_t entries = event.GetNumPixels();
-
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = event[i];
-        if (!pix.IsPixelUsed())
-            continue;
-
-        const Int_t id = pix.GetPixId();
-
-        fData[id] = pix.GetNumPhotons()*fGeomCam->GetPixRatio(id);
-        (*this)[id].SetBit(kIsUsed);
-    }
-}
-
-// ------------------------------------------------------------------------
-//
-// Call this function to fill the number of photo electron into the
-// camera.
-//
-void MCamDisplay::FillPedestals(const MPedestalCam &event)
+    // FIXME: Security check missing!
+    for (UInt_t idx=0; idx<fNumPixels; idx++)
+    {
+        fData[idx] = 0;
+        if (event.GetPixelContent(fData[idx], idx, fGeomCam->GetPixRatio(idx), type))
+            (*this)[idx].SetBit(kIsUsed);
+    }
+}
+
+// ------------------------------------------------------------------------
+//
+// Call this function to fill the currents
+//
+void MCamDisplay::Fill(const TArrayF &event, Bool_t ispos)
 {
     Reset();
 
-    const Int_t entries = event.GetSize();
-    for (Int_t i=0; i<entries; i++)
-    {
-        fData[i] = event[i].GetMean()*fGeomCam->GetPixRatio(i);
-        (*this)[i].SetBit(kIsUsed);
-    }
-}
-
-// ------------------------------------------------------------------------
-//
-// Call this function to fill the error of number of photo electron
-// into the camera.
-//
-void MCamDisplay::FillErrorPhot(const MCerPhotEvt &event)
-{
-    Reset();
-
-    const Int_t entries = event.GetNumPixels();
-
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = event[i];
-        if (!pix.IsPixelUsed())
-            continue;
-
-        const Int_t id = pix.GetPixId();
-
-        fData[id] = pix.GetErrorPhot()*sqrt(fGeomCam->GetPixRatio(id));
-        (*this)[id].SetBit(kIsUsed);
-    }
-}
-
-// ------------------------------------------------------------------------
-//
-// Call this function to fill the ratio of the number of photons
-// divided by its error
-//
-void MCamDisplay::FillRatio(const MCerPhotEvt &event)
-{
-    Reset();
-
-    const Int_t entries = event.GetNumPixels();
-
-    for (Int_t i=0; i<entries; i++)
-    {
-        const MCerPhotPix &pix = event[i];
-
-        if (!pix.IsPixelUsed())
-            continue;
-
-        const Int_t id = pix.GetPixId();
-
-        const Float_t  entry = pix.GetNumPhotons();
-        const Float_t  noise = pix.GetErrorPhot();
-        const Double_t ratio = TMath::Sqrt(fGeomCam->GetPixRatio(id));
-
-        fData[id] = entry*ratio/noise;
-        (*this)[id].SetBit(kIsUsed);
-    }
-}
-
-// ------------------------------------------------------------------------
-//
-// Call this function to fill the currents
-//
-void MCamDisplay::FillCurrents(const MCurrents &event)
-{
-    Reset();
-
-    // FIXME: Security check missing!
-    for (UInt_t i=0; i<fNumPixels; i++)
-    {
-        if (event[i]<=0)
-            continue;
-
-        (*this)[i].SetBit(kIsUsed);
-        fData[i] = event[i];
-    }
+    fData = event;
+
+    for (UInt_t idx=0; idx<fNumPixels; idx++)
+        if (!ispos || fData[idx]>0)
+            (*this)[idx].SetBit(kIsUsed);
 }
 
@@ -562 +513 @@
 void MCamDisplay::FillLevels(const MCerPhotEvt &event, Float_t lvl1, Float_t lvl2)
 {
-    FillRatio(event);
+    Fill(event, 2);
 
     for (UInt_t i=0; i<fNumPixels; i++)
@@ -793 +744 @@
 }
 
+Int_t MCamDisplay::GetPixelIndex(Int_t px, Int_t py) const
+{
+    UInt_t i;
+    for (i=0; i<fNumPixels; i++)
+    {
+        if ((*fPixels)[i]->DistancetoPrimitive(px, py)>0)
+            continue;
+
+        return i;
+    }
+    return -1;
+}
+
 // ------------------------------------------------------------------------
 //
@@ -800 +764 @@
 char *MCamDisplay::GetObjectInfo(Int_t px, Int_t py) const
 {
-    static char info[64];
-
-    UInt_t i;
-    for (i=0; i<fNumPixels; i++)
-    {
-        if ((*fPixels)[i]->DistancetoPrimitive(px, py)>0)
-            continue;
-
-        sprintf(info, "Pixel Id: %d", i);
-        return info;
-    }
-    return TObject::GetObjectInfo(px, py);
-}
+    static char info[128];
+
+    const Int_t idx=GetPixelIndex(px, py);
+
+    if (idx<0)
+        return TObject::GetObjectInfo(px, py);
+
+    sprintf(info, "Software Pixel Index: %d (Hardware Id=%d)", idx, idx+1);
+    return info;
+}
+
+// ------------------------------------------------------------------------
+//
+// Execute a mouse event on the camera
+//
+void MCamDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
+{
+    //if (event==kMouseMotion && fStatusBar)
+    //    fStatusBar->SetText(GetObjectInfo(px, py), 0);
+    if (event!=kButton1Down)
+        return;
+
+    const Int_t idx = GetPixelIndex(px, py);
+    if (idx<0)
+        return;
+
+    cout << "Software Pixel Index: " << idx << endl;
+    cout << "Hardware Pixel Id:    " << idx+1 << endl;
+    cout << "Contents:             " << fData[idx] << endl;
+
+    //fNotify->Print();
+    if (fNotify->GetSize()>0)
+        new TCanvas;
+    fNotify->ForEach(MCamEvent, DrawPixelContent)(idx);
+}

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -22 +22 @@
 class TText;
 class TArrow;
+class TGStatusBar;
 
 class MGeomCam;
 class MHexagon;
+class MCurrents;
+class MCamEvent;
 class MRflEvtData;
-class MCurrents;
 class MCerPhotEvt;
 class MCerPhotPix;
@@ -60 +62 @@
     Float_t        fMaximum;
 
+    TList         *fNotify;
+
+    //TGStatusBar   *fStatusBar;
+
     TBox  *GetBox(Int_t i)  { return (TBox*) fLegend->At(i); }
 
@@ -71 +77 @@
     void  SetPalette();
 
+    Int_t GetPixelIndex(Int_t px, Int_t py) const;
+
     enum {
         kIsUsed = BIT(14)
@@ -81 +89 @@
 
     void  SetAutoScale(Bool_t input=kTRUE); // *MENU*
-    void  FillPhotNum(const MCerPhotEvt &event);
-    void  FillRatio(const MCerPhotEvt &event);
+
+    void  ShowRflEvent(const MRflEvtData *event=NULL, EMarkerStyle m=kFullDotMedium);
+    void  FillRflEvent(const MRflEvtData &event);
     void  FillLevels(const MCerPhotEvt &event, Float_t lvl1, Float_t lvl2);
-    void  FillErrorPhot(const MCerPhotEvt &event);
     void  FillLevels(const MCerPhotEvt &event, const MImgCleanStd &clean);
-    void  FillPedestals(const MPedestalCam &event);
-    void  FillRflEvent(const MRflEvtData &event);
-    void  FillCurrents(const MCurrents &event);
-    void  ShowRflEvent(const MRflEvtData *event=NULL, EMarkerStyle m=kFullDotMedium);
+    void  Fill(const MCamEvent &event, Int_t type=0);
+    void  Fill(const TArrayF &event, Bool_t ispos=kTRUE);
 
     void  DrawPixelNumbers();
@@ -99 +105 @@
     Int_t DistancetoPrimitive(Int_t px, Int_t py);
     char *GetObjectInfo(Int_t px, Int_t py) const;
-    //virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
+    void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
 
     void  SetPalette(Int_t ncolors, Int_t *colors);
@@ -111 +117 @@
     void  SetMinimum(Float_t m); // *MENU*
     void  SetMaximum(Float_t m); // *MENU*
+
+    void  AddNotify(const MCamEvent &event) { fNotify->Add((TObject*)(&event)); }
+
+    //void SetStatusBar(TGStatusBar *bar) { fStatusBar = bar; }
 
     ClassDef(MCamDisplay, 0) // Displays the magic camera

trunk/MagicSoft/Mars/mgui/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mgeom -I../manalysis -I../mimage -I../mhist \
-           -I../mreflector
+           -I../mreflector -I../mraw
 
 #------------------------------------------------------------------------------
@@ -30 +30 @@
 
 SRCFILES = MHexagon.cc \
-           MCamDisplay.cc 
+           MCamEvent.cc \
+           MCamDisplay.cc
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -501 +501 @@
 
     //
-    // Check whether fDisplay has previously been used (fCanvas)
-    // and fDisplay is still open.
-    //
-    if (fCanvas && fDisplay)
+    // Check whether fDisplay has previously been used (fCanvas),
+    // fDisplay is still open and the corresponding Canvas/Tab is
+    // still existing.
+    //
+    if (fDisplay && fDisplay->HasCanvas(fCanvas))
     {
         fCanvas->cd();

trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.cc

@@ -127 +127 @@
     const UInt_t n = evt->GetNumPixels();
 
-    for (UInt_t i=0; i<n; i++)
+    for (UInt_t idx=0; idx<n; idx++)
     {
-        const MCerPhotPix &pix = (*evt)[i];
+        Float_t val;
+        if (!evt->GetPixelContent(val, idx))
+            continue;
 
-        const Int_t id = pix.GetPixId();
-
-        fSum[id].SetPixelUsed();
-        fSum[id].AddNumPhotons(pix.GetNumPhotons());
+        fSum[idx].SetPixelUsed();
+        fSum[idx].AddNumPhotons(val);
     }
 
@@ -148 +148 @@
 Bool_t MHCerPhotEvt::Finalize()
 {
-    fSum.Scale(fEntries);
+    if (fEntries<1)
+        *fLog << warn << "WARNING - " << GetDescriptor() << " doesn't contain entries." << endl;
+    else
+        fSum.Scale(fEntries);
     return kTRUE;
 }
@@ -185 +188 @@
         fDispl = new MCamDisplay(fCam);
 
-    fDispl->FillPhotNum(fSum);
+    fDispl->Fill(fSum);
     fDispl->Paint();
 }

trunk/MagicSoft/Mars/mhist/MHCurrents.cc

@@ -36 +36 @@
 
 #include "MParList.h"
+#include "MBinning.h"
 #include "MCurrents.h"
 #include "MCamDisplay.h"
@@ -54 +55 @@
     // FIXME: Implement a clear function with setmem
     for (int i=0; i<577; i++)
+    {
         fSum[i] = 0;
+        fRms[i] = 0;
+    }
 
     fEntries = 0;
@@ -65 +69 @@
 //
 MHCurrents::MHCurrents(const char *name, const char *title)
-    : fSum(577), fCam(NULL), fEvt(NULL), fDispl(NULL)
+    : fSum(577), fRms(577), fCam(NULL), fEvt(NULL), fDispl(NULL)
 {
     //
@@ -74 +78 @@
 
     Clear();
+
+    fHist.SetName("currents");
+    fHist.SetTitle("Avg.Currents [nA]");
+    fHist.SetDirectory(NULL);
+    fHist.Sumw2();
 }
 
@@ -105 +114 @@
     Clear();
 
+    MBinning bins;
+    bins.SetEdges(577, -0.5, 576.5);
+    bins.Apply(fHist);
+
     return kTRUE;
 }
@@ -121 +134 @@
     }
 
+    for (UInt_t idx=0; idx<577; idx++)
+    {
+        Float_t val;
+        if (!evt->GetPixelContent(val, idx))
+            continue;
+
+        fSum[idx] += val;
+        fRms[idx] += val*val;
+    }
+
+    fEntries++;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Scale the sum container with the number of entries
+//
+Bool_t MHCurrents::Finalize()
+{
+    if (fEntries<2)
+    {
+        *fLog << warn << "WARNING - " << GetDescriptor() << " doesn't contain enough entries." << endl;
+        return kTRUE;
+    }
+
     for (UInt_t i=0; i<577; i++)
-        fSum[i] += (*evt)[i];
-
-    fEntries++;
-
+    {
+        // calc sdev^2 for pixel index i
+        // var^2 = (sum[xi^2] - sum[xi]^2/n) / (n-1);
+        fRms[i] -= fSum[i]*fSum[i]/fEntries;
+        fRms[i] /= fEntries-1;
+        fRms[i]  = TMath::Sqrt(fRms[i]);
+
+        // calc mean value for pixel index i
+        fSum[i] /= fEntries;
+
+        fHist.SetBinContent(i+1, fSum[i]);
+        fHist.SetBinError(  i+1, fRms[i]);
+    }
     return kTRUE;
 }
@@ -131 +180 @@
 // --------------------------------------------------------------------------
 //
-// Scale the sum container with the number of entries
-//
-Bool_t MHCurrents::Finalize()
-{
-    for (UInt_t i=0; i<577; i++)
-        fSum[i] /= fEntries;
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
 // Draw the present 'fill status'
 //
-void MHCurrents::Draw(Option_t *)
+void MHCurrents::Draw(Option_t *o)
 {
     if (!fCam)
@@ -156 +193 @@
     pad->SetBorderMode(0);
 
+    SetDrawOption(o);
     AppendPad("");
 }
@@ -174 +212 @@
         fDispl = new MCamDisplay(fCam);
 
-    fDispl->FillCurrents(fSum);
+    TString opt(GetDrawOption());
+
+    fDispl->Fill(opt.Contains("rms", TString::kIgnoreCase) ? fRms : fSum);
     fDispl->Paint();
 }

trunk/MagicSoft/Mars/mhist/MHCurrents.h

@@ -6 +6 @@
 #endif
 
-#ifndef MARS_MCurrents
-#include "MCurrents.h"
+#ifndef ROOT_TH1
+#include <TH1.h>
 #endif
 
-class TH1D;
+#ifndef ROOT_TArrayF
+#include <TArrayF.h>
+#endif
+
+class MCurrents;
 class MGeomCam;
 class MCamDisplay;
@@ -17 +21 @@
 {
 private:
-    MCurrents    fSum;      // storing the sum
+    TArrayF      fSum;      // storing the sum
+    TArrayF      fRms;      // storing the rms
     Int_t        fEntries;  // number of entries in the histogram
     MGeomCam    *fCam;      // the present geometry
     MCurrents   *fEvt;      //! the current event
     MCamDisplay *fDispl;    //! the camera display
+
+    TH1F         fHist;
 
 public:
@@ -35 +42 @@
     TH1 *GetHistByName(const TString name) { return NULL; }
 
-    const MCurrents &GetSum() const { return fSum; }
+    const TArrayF &GetSum() const { return fSum; }
+    const TArrayF &GetRms() const { return fRms; }
+
+    const TH1F    &GetHist() const { return fHist; }
 
     void Draw(Option_t *opt="");

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -181 +181 @@
     filemenu->AddEntry("Save As status.&root", kFileSaveAsRoot);
     filemenu->AddSeparator();
+    filemenu->AddEntry("Re&set",               kFileReset);
+    filemenu->AddSeparator();
     filemenu->AddEntry("Print with &lpr",      kFilePrint);
     //filemenu->AddEntry("Set printer &name",    kFilePrinterName);
@@ -196 +198 @@
     tabmenu->AddEntry("Save As tab-i.&C",    kTabSaveAsC);
     tabmenu->AddEntry("Save As tab-i.&root", kTabSaveAsRoot);
+    tabmenu->AddSeparator();
+    tabmenu->AddEntry("Re&move",             kTabRemove);
     tabmenu->AddSeparator();
     tabmenu->AddEntry("Print with &lpr",     kFilePrint);
@@ -560 +564 @@
 // to the corresponding TCanvas. If it isn't found NULL is returned.
 //
-TCanvas *MStatusDisplay::GetCanvas(TGCompositeFrame *cf) const
+TRootEmbeddedCanvas *MStatusDisplay::GetEmbeddedCanvas(TGCompositeFrame *cf) const
 {
     TIter Next(cf->GetList());
@@ -567 +571 @@
     while ((f=(TGFrameElement*)Next()))
         if (f->fFrame->InheritsFrom(TRootEmbeddedCanvas::Class()))
-            return ((TRootEmbeddedCanvas*)f->fFrame)->GetCanvas();
+            return (TRootEmbeddedCanvas*)f->fFrame;
 
     return NULL;
+}
+
+// --------------------------------------------------------------------------
+//
+// Takes a TGCompositeFrame as argument. Searches for the first
+// TRootEmbeddedCanvas which is contained by it and returns a pointer
+// to the corresponding TCanvas. If it isn't found NULL is returned.
+//
+TCanvas *MStatusDisplay::GetCanvas(TGCompositeFrame *cf) const
+{
+    TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(cf);
+    return ec ? ec->GetCanvas() : NULL;
 }
 
@@ -654 +670 @@
     c.SetBorderMode(0);
 
-    // If kNoContaxtMenu set set kNoCOntextMenu of the canvas
+    // If kNoContextMenu set set kNoContextMenu of the canvas
     if (TestBit(kNoContextMenu))
         c.SetBit(kNoContextMenu);
@@ -738 +754 @@
 
     return pages;
+}
+
+// --------------------------------------------------------------------------
+//
+// Remove tab no i if this tab contains a TRootEmbeddedCanvas
+//
+void MStatusDisplay::RemoveTab(int i)
+{
+    TGCompositeFrame *f = fTab->GetTabContainer(i);
+    if (!f)
+        return;
+
+    TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(f);
+    if (!ec)
+        return;
+
+    TCanvas *c = ec->GetCanvas();
+    if (!c)
+        return;
+
+    const TString name(c->GetName());
+
+    f->RemoveFrame(ec);
+    delete fList->Remove(ec);
+
+    fTab->RemoveTab(i);
+
+    // layout and map new tab
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
+    MapSubwindows();
+    Layout();
+#else
+    Layout();
+    MapSubwindows();
+#endif
+
+    // display new tab in the main frame
+    gClient->ProcessEventsFor(fTab);
+
+    *fLog << inf << "Removed Tab #" << i << " '" << name << "'" << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+// Use this to check whether the MStatusDisplay still contains the
+// TCanvas c. It could be removed meanwhile by menu usage.
+//
+Bool_t MStatusDisplay::HasCanvas(const TCanvas *c) const
+{
+    for (int i=1; i<fTab->GetNumberOfTabs(); i++)
+        if (c==GetCanvas(i))
+            return kTRUE;
+    return kFALSE;
 }
 
@@ -773 +842 @@
         return kTRUE;
 
+    case kFileReset:
+        for (int i=fTab->GetNumberOfTabs()-1; i>0; i--)
+            RemoveTab(i);
+        return kTRUE;
         /*
     case kFileSave:
@@ -828 +901 @@
     case kTabPrevious:
         fTab->SetTab(fTab->GetCurrent()-1);
+        return kTRUE;
+
+    case kTabRemove:
+        RemoveTab(fTab->GetCurrent());
         return kTRUE;
 

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -27 +27 @@
 class TGProgressBar;
 class TGHProgressBar;
+class TRootEmbeddedCanvas;
 
 class MStatusDisplay : public TGMainFrame
@@ -35 +36 @@
         kFileBrowser, kFileCanvas, kFileSave, kFileSaveAs, kFileSaveAsPS,
         kFileSaveAsRoot, kFileSaveAsGIF, kFileSaveAsC, kFilePrint,
-        kFilePrinterName, kFileExit,
+        kFilePrinterName, kFileExit, kFileReset,
         // kLoop
         kLoopNone, kLoopStop,
         // kTab
         kTabSave, kTabSaveAs, kTabSaveAsPS, kTabSaveAsRoot, kTabSaveAsGIF,
-        kTabSaveAsC, kTabPrint, kTabNext, kTabPrevious,
+        kTabSaveAsC, kTabPrint, kTabNext, kTabPrevious, kTabRemove,
         // kSize
         kSize640, kSize800, kSize960, kSize1024, kSize1280,
@@ -102 +103 @@
     void UpdatePSHeader(const TString &name) const;
 
+    void Reset();
+    void RemoveTab(int i);
+
+    TRootEmbeddedCanvas *GetEmbeddedCanvas(TGCompositeFrame *cf) const;
+
 public:
      MStatusDisplay(Long_t t=1000);
@@ -122 +128 @@
      TCanvas &AddTab(const char *name);
 
+     Bool_t   HasCanvas(const TCanvas *c) const;
      TCanvas *GetCanvas(int i) const;
      TCanvas *GetCanvas(const TString &name) const;

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
 
 #------------------------------------------------------------------------------