Changeset 2377 for trunk/MagicSoft/Mars/mhist

Timestamp:

10/04/03 12:47:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.cc (modified) (19 diffs)
• MHCamera.h (modified) (2 diffs)
• MHCurrents.cc (modified) (5 diffs)
• MHFadcCam.cc (modified) (5 diffs)
• MHFadcCam.h (modified) (2 diffs)
• MHTriggerLvl0.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -78 +78 @@
 using namespace std;
 
-// ------------------------------------------------------------------------
-//
-//  Default Constructor. To be used by the root system ONLY.
-//
-MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fColors(kItemsLegend)
+void MHCamera::Init()
 {
     SetDirectory(NULL);
 
-    fNotify  = NULL;
+    SetLineColor(kGreen);
+    SetMarkerStyle(kFullDotMedium);
+    SetXTitle("Pixel Index");
+
+    fNotify  = new TList;
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
@@ -97 +97 @@
 // ------------------------------------------------------------------------
 //
+//  Default Constructor. To be used by the root system ONLY.
+//
+MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fColors(kItemsLegend)
+{
+    Init();
+}
+
+// ------------------------------------------------------------------------
+//
 //  Constructor. Makes a clone of MGeomCam. Removed the TH1D from the
 // current directory. Calls Sumw2(). Set the histogram line color
@@ -102 +111 @@
 //
 MHCamera::MHCamera(const MGeomCam &geom, const char *name, const char *title)
-: TH1D(name, title, geom.GetNumPixels(), -0.5, geom.GetNumPixels()-0.5),
-fUsed(geom.GetNumPixels()), fColors(kItemsLegend)
-{
-    fGeomCam = (MGeomCam*)geom.Clone();
-
-    SetDirectory(NULL);
-    Sumw2();
-
-    SetLineColor(kGreen);
-    SetMarkerStyle(kFullDotMedium);
-    SetXTitle("Pixel Index");
-
-    fNotify = new TList;
-
-    //
-    //  create the hexagons of the display
+: fGeomCam(NULL), /*TH1D(name, title, geom.GetNumPixels(), -0.5, geom.GetNumPixels()-0.5),
+fUsed(geom.GetNumPixels()),*/ fColors(kItemsLegend)
+{
+    //fGeomCam = (MGeomCam*)geom.Clone();
+    SetGeometry(geom, name, title);
+    Init();
+
     //
     // root 3.02
@@ -123 +123 @@
     //    register BIT(8) as kNoContextMenu. If an object has this bit set it will
     //    not get an automatic context menu when clicked with the right mouse button.
-
-    //
-    // Construct all hexagons. Use new-operator with placement
-    //
+}
+
+void MHCamera::SetGeometry(const MGeomCam &geom, const char *name, const char *title)
+{
+    SetNameTitle(name, title);
+
+    TAxis &x = *GetXaxis();
+
+    SetBins(geom.GetNumPixels(), 0, 1);
+    x.Set(geom.GetNumPixels(), -0.5, geom.GetNumPixels()-0.5);
+
+    //SetBins(geom.GetNumPixels(), -0.5, geom.GetNumPixels()-0.5);
+    //Rebuild();
+
+    Sumw2(); // necessary?
+
+    if (fGeomCam)
+        delete fGeomCam;
+    fGeomCam = (MGeomCam*)geom.Clone();
+
+    fUsed.Set(geom.GetNumPixels());
     for (Int_t i=0; i<fNcells-2; i++)
         ResetUsed(i);
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
-    SetPalette(1, 0);
-#else
-    SetPalette(51, 0);
-#endif
 }
 
@@ -229 +241 @@
 Int_t MHCamera::Fill(Axis_t x, Axis_t y, Stat_t w)
 {
+    if (fNcells<=1)
+        return -1;
+
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
@@ -243 +258 @@
 Stat_t MHCamera::GetMean(Int_t axis) const
 {
+    if (fNcells<=1)
+        return 0;
+
     Stat_t mean = 0;
     for (int i=1; i<fNcells-1; i++)
@@ -252 +270 @@
 Stat_t MHCamera::GetRMS(Int_t axis) const
 {
+    if (fNcells<=1)
+        return -1;
+
     const Int_t n = fNcells-2;
 
@@ -278 +299 @@
         return fMinimum;
 
+    if (fNcells<=1)
+        return 0;
+
     Double_t minimum=FLT_MAX;
 
@@ -304 +328 @@
     if (fMaximum != -1111)
         return fMaximum;
+
+    if (fNcells<=1)
+        return 1;
 
     Double_t maximum=-FLT_MAX;
@@ -491 +518 @@
 void MHCamera::Paint(Option_t *o)
 {
+    if (fNcells<=1)
+        return;
+
     TString opt(o);
     opt.ToLower();
@@ -585 +615 @@
 void MHCamera::DrawPixelIndices()
 {
+    if (fNcells<=1)
+        return;
+
     // FIXME: Is this correct?
     for (int i=0; i<kItemsLegend; i++)
@@ -609 +642 @@
 void MHCamera::DrawSectorIndices()
 {
+    if (fNcells<=1)
+        return;
+
     for (int i=0; i<kItemsLegend; i++)
         fColors[i] = 16;
@@ -637 +673 @@
 void MHCamera::AddCamContent(const MCamEvent &event, Int_t type)
 {
+    if (fNcells<=1)
+        return;
+
     // FIXME: Security check missing!
     for (Int_t idx=0; idx<fNcells-2; idx++)
@@ -717 +756 @@
 void MHCamera::CntCamContent(const MCamEvent &event, Double_t threshold, Int_t type)
 {
+    if (fNcells<=1)
+        return;
+
     // FIXME: Security check missing!
     for (Int_t idx=0; idx<fNcells-2; idx++)
@@ -757 +799 @@
 void MHCamera::FillRandom()
 {
+    if (fNcells<=1)
+        return;
+
     Reset();
 
@@ -775 +820 @@
 void MHCamera::FillLevels(const MCerPhotEvt &event, Float_t lvl1, Float_t lvl2)
 {
+    if (fNcells<=1)
+        return;
+
     SetCamContent(event, 2);
 
@@ -807 +855 @@
 void MHCamera::Reset(Option_t *opt)
 {
+    if (fNcells<=1)
+        return;
+
     TH1::Reset(opt);
 
@@ -965 +1016 @@
 Int_t MHCamera::DistancetoPrimitive(Int_t px, Int_t py)
 {
+    if (fNcells<=1)
+        return 999999;
+
     const Int_t kMaxDiff = 7;
 
@@ -1014 +1068 @@
 Int_t MHCamera::GetPixelIndex(Int_t px, Int_t py) const
 {
+    if (fNcells<=1)
+        return -1;
+
     Int_t i;
     for (i=0; i<fNcells-2; i++)

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -38 +38 @@
 
     //TGStatusBar   *fStatusBar;
+    void Init();
 
     Int_t GetColor(Float_t val, Float_t min, Float_t max, Bool_t islog);
@@ -72 +73 @@
     MHCamera(const MGeomCam &geom, const char *name="", const char *title="");
     ~MHCamera();
+
+    void SetGeometry(const MGeomCam &geom, const char *name="", const char *title="");
+    const MGeomCam* GetGeometry() const { return fGeomCam; }
 
     Bool_t IsUsed(Int_t idx) const { return TESTBIT(const_cast<TArrayC&>(fUsed)[idx], kIsUsed); }

trunk/MagicSoft/Mars/mhist/MHCurrents.cc

@@ -53 +53 @@
 void MHCurrents::Clear(const Option_t *)
 {
+    const Int_t n = fCam ? fCam->GetNumPixels() : 577;
+
     // FIXME: Implement a clear function with setmem
-    for (int i=0; i<577; i++)
+    fSum.Set(n); // also clears memory
+    fRms.Set(n);
+/*    for (int i=0; i<577; i++)
     {
         fSum[i] = 0;
         fRms[i] = 0;
-    }
+    }*/
 
     fEntries = 0;
@@ -69 +73 @@
 //
 MHCurrents::MHCurrents(const char *name, const char *title)
-    : fSum(577), fRms(577), fCam(NULL), fEvt(NULL), fDispl(NULL)
+    : /*fSum(577), fRms(577), */fCam(NULL), fEvt(NULL), fDispl(NULL)
 {
     //
@@ -113 +117 @@
 
     fCam = (MGeomCam*)plist->FindObject("MGeomCam");
-    if (!fCam)
-        *fLog << warn << GetDescriptor() << ": No MGeomCam found." << endl;
+    /*
+    if (!fCam)
+        *fLog << warn << GetDescriptor() << ": No MGeomCam found... assuming Magic geometry!" << endl;
+    */
+    if (!fCam)
+    {
+        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
+        return kFALSE;
+    }
 
     Clear();
 
+    const Int_t n = fSum.GetSize();
+
     MBinning bins;
-    bins.SetEdges(577, -0.5, 576.5);
+    bins.SetEdges(n, -0.5, n-0.5);
     bins.Apply(fHist);
 
@@ -138 +151 @@
     }
 
-    for (UInt_t idx=0; idx<577; idx++)
+    const Int_t n = fSum.GetSize();
+    for (UInt_t idx=0; idx<n; idx++)
     {
         Float_t val;
@@ -166 +180 @@
     }
 
-    for (UInt_t i=0; i<577; i++)
+    const Int_t n = fSum.GetSize();
+    for (UInt_t i=0; i<n; i++)
     {
         // calc sdev^2 for pixel index i

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -37 +37 @@
 #include "MLogManip.h"
 
+#include "MParList.h"
+#include "MGeomCam.h"
+
 #include "MRawEvtData.h"
 #include "MRawEvtPixelIter.h"
@@ -49 +52 @@
 //  creates an a list of histograms for all pixels and both gain channels
 //
-MHFadcCam::MHFadcCam(const Int_t n, MHFadcPix::Type_t t, const char *name, const char *title)
+MHFadcCam::MHFadcCam(/*const Int_t n,*/ MHFadcPix::Type_t t, const char *name, const char *title)
     : fNumHiGains(-1), fNumLoGains(-1), fType(t)
 {
@@ -63 +66 @@
     // connect all the histogram with the container fHist
     //
-    fArray = new TObjArray(n);
+    fArray = new TObjArray;
+    fArray->SetOwner();
 
-    for (Int_t i=0; i<n; i++)
-        (*fArray)[i] = new MHFadcPix(i, fType);
+    //    for (Int_t i=0; i<n; i++)
+    //        (*fArray)[i] = new MHFadcPix(i, fType);
 }
 
@@ -87 +91 @@
     // FIXME, this might be done faster and more elegant, by direct copy.
     //
-    MHFadcCam *cam = new MHFadcCam(n);
+    MHFadcCam *cam = new MHFadcCam(fType);
+
+    cam->fArray->Expand(n);
 
     for (int i=0; i<n; i++)
@@ -95 +101 @@
     }
     return cam;
+}
+
+// --------------------------------------------------------------------------
+//
+// To setup the object we get the number of pixels from a MGeomCam object
+// in the Parameter list.
+//
+Bool_t MHFadcCam::SetupFill(const MParList *pList)
+{
+    MGeomCam *cam = (MGeomCam*)pList->FindObject("MGeomCam");
+    if (!cam)
+    {
+        *fLog << err << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl;
+        return kFALSE;
+    }
+
+    const Int_t n = cam->GetNumPixels();
+
+    fArray->Delete();
+    fArray->Expand(n);
+
+    for (Int_t i=0; i<n; i++)
+        (*fArray)[i] = new MHFadcPix(i, fType);
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -33 +33 @@
 
 public:
-    MHFadcCam(const Int_t n=577, MHFadcPix::Type_t t=MHFadcPix::kValue, const char *name=NULL, const char *title=NULL);
+    MHFadcCam(/*const Int_t n=577,*/ MHFadcPix::Type_t t=MHFadcPix::kValue, const char *name=NULL, const char *title=NULL);
     ~MHFadcCam();
 
@@ -45 +45 @@
     const TH1F *GetHistLo(UInt_t i) const { return (*this)[i].GetHistLo(); }
 
+    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     Bool_t Fill(const MRawEvtData *par);

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.cc

@@ -100 +100 @@
     MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
     if (!cam)
-        *fLog << warn << GetDescriptor() << ": No MGeomCam found." << endl;
+    {
+        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
+        return kFALSE;
+    }
 
     if (fSum)