Changeset 1524 for trunk/MagicSoft/Mars/mhist

Timestamp:

09/16/02 10:10:17 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH3.cc (modified) (11 diffs)
• MH3.h (modified) (2 diffs)
• MHHillas.cc (modified) (1 diff)
• MHMatrix.cc (modified) (6 diffs)
• MHMatrix.h (modified) (7 diffs)
• MHStarMap.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -62 +62 @@
 #include <fstream.h>
 
+#include <TPad.h>
+#include <TStyle.h>
+#include <TCanvas.h>
+
 #include <TH2.h>
 #include <TH3.h>
 #include <TProfile.h>
 #include <TProfile2D.h>
-#include <TPad.h>
-#include <TCanvas.h>
 
 #include "MLog.h"
@@ -73 +75 @@
 
 #include "MParList.h"
-
+#include "MBinning.h"
 #include "MDataChain.h"
 
@@ -202 +204 @@
             return kFALSE;
         }
+        if (binsz->IsLogarithmic())
+            fHist->SetBit(kIsLogz);
         fHist->SetZTitle(fData[2]->GetTitle());
         if (!fData[2]->PreProcess(plist))
@@ -212 +216 @@
             return kFALSE;
         }
+        if (binsy->IsLogarithmic())
+            fHist->SetBit(kIsLogy);
         fHist->SetYTitle(fData[1]->GetTitle());
         if (!fData[1]->PreProcess(plist))
@@ -222 +228 @@
             return kFALSE;
         }
+        if (binsx->IsLogarithmic())
+            fHist->SetBit(kIsLogx);
         fHist->SetXTitle(fData[0]->GetTitle());
         if (!fData[0]->PreProcess(plist))
@@ -306 +314 @@
     return kFALSE;
 }
+/*
+// --------------------------------------------------------------------------
+//
+// Set the palette you wanna use:
+//  - you could set the root "Pretty Palette Violet->Red" by
+//    gStyle->SetPalette(1, 0), but in some cases this may look
+//    confusing
+//  - The maximum colors root allowes us to set by ourself
+//    is 50 (idx: 51-100). This colors are set to a grayscaled
+//    palette
+//  - the number of contours must be two less than the number
+//    of palette entries
+//
+void MHStarMap::PrepareDrawing() const
+{
+    const Int_t numg = 32; // number of gray scaled colors
+    const Int_t numw = 32; // number of white
+
+    Int_t palette[numg+numw];
+
+    //
+    // The first half of the colors are white.
+    // This is some kind of optical background supression
+    //
+    gROOT->GetColor(51)->SetRGB(1, 1, 1);
+
+    Int_t i;
+    for (i=0; i<numw; i++)
+        palette[i] = 51;
+
+    //
+    // now the (gray) scaled part is coming
+    //
+    for (;i<numw+numg; i++)
+    {
+        const Float_t gray = 1.0-(float)(i-numw)/(numg-1.0);
+
+        gROOT->GetColor(52+i)->SetRGB(gray, gray, gray);
+        palette[i] = 52+i;
+    }
+
+    //
+    // Set the palette and the number of contour levels
+    //
+    gStyle->SetPalette(numg+numw, palette);
+    fStarMap->SetContour(numg+numw-2);
+}
+*/
+// --------------------------------------------------------------------------
+//
+// Setup a inversed deep blue sea palette for the fCenter histogram.
+//
+void MH3::SetColors() const
+{
+    // FIXME: This must be redone each time the canvas is repainted....
+    gStyle->SetPalette(51, NULL);
+    Int_t c[50];
+    for (int i=0; i<50; i++)
+        c[49-i] = gStyle->GetColorPalette(i);
+    gStyle->SetPalette(50, c);
+}
 
 // --------------------------------------------------------------------------
 //
 // Draw clone of histogram. So that the object can be deleted
+//
+// Possible options are:
+//   PROFX: Draw a x-profile into the histogram (for 2D histograms only)
+//   PROFY: Draw a y-profile into the histogram (for 2D histograms only)
+//   ONLY:  Draw the profile histogram only (for 2D histograms only)
+//
+// If the kIsLog?-Bit is set the axis is displayed lkogarithmically.
+// eg this is set when applying a logarithmic MBinning
+//
 // and the histogram is still visible in the canvas.
 // The cloned object are deleted together with the canvas if the canvas is
@@ -324 +402 @@
     gROOT->SetSelectedPad(NULL);
 
-    fHist->DrawCopy(opt);
-
     TString str(opt);
+
+    if (str.Contains("COL", TString::kIgnoreCase))
+        SetColors();
+
+    Bool_t only = str.Contains("ONLY", TString::kIgnoreCase) && fDimension==2;
+    if (!only)
+        fHist->DrawCopy(opt);
+
     if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
     {
         TProfile *p = ((TH2*)fHist)->ProfileX();
-        p->Draw("same");
+        p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
         p->SetDirectory(NULL);
@@ -337 +421 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileY();
-        p->Draw("same");
+        p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
         p->SetDirectory(NULL);
     }
 
+    if (fHist->TestBit(kIsLogx)) c.SetLogx();
+    if (fHist->TestBit(kIsLogy)) c.SetLogy();
+    if (fHist->TestBit(kIsLogz)) c.SetLogz();
+
     c.Modified();
     c.Update();
@@ -351 +439 @@
 //
 // Creates a new canvas and draws the histogram into it.
+//
+// Possible options are:
+//   PROFX: Draw a x-profile into the histogram (for 2D histograms only)
+//   PROFY: Draw a y-profile into the histogram (for 2D histograms only)
+//   ONLY:  Draw the profile histogram only (for 2D histograms only)
+//
+// If the kIsLog?-Bit is set the axis is displayed lkogarithmically.
+// eg this is set when applying a logarithmic MBinning
+//
 // Be careful: The histogram belongs to this object and won't get deleted
 // together with the canvas.
@@ -359 +456 @@
         MH::MakeDefCanvas(fHist);
 
-    fHist->Draw(opt);
-
     TString str(opt);
+
+    if (str.Contains("COL", TString::kIgnoreCase))
+        SetColors();
+
+    Bool_t only = str.Contains("ONLY", TString::kIgnoreCase) && fDimension==2;
+    if (!only)
+        fHist->Draw(opt);
+
     if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
     {
         TProfile *p = ((TH2*)fHist)->ProfileX();
-        p->Draw("same");
+        p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
         p->SetDirectory(NULL);
@@ -372 +475 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileY();
-        p->Draw("same");
+        p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
         p->SetDirectory(NULL);
     }
+
+    if (fHist->TestBit(kIsLogx)) gPad->SetLogx();
+    if (fHist->TestBit(kIsLogy)) gPad->SetLogy();
+    if (fHist->TestBit(kIsLogz)) gPad->SetLogz();
 
     gPad->Modified();

trunk/MagicSoft/Mars/mhist/MH3.h

@@ -26 +26 @@
     void StreamPrimitive(ofstream &out) const;
 
+    enum {
+        kIsLogx = BIT(15),
+        kIsLogy = BIT(16),
+        kIsLogz = BIT(17)
+    };
+
 public:
     MH3();
@@ -48 +54 @@
     const TH1 &GetHist() const { return *fHist; }
 
+    void SetColors() const;
     void Draw(Option_t *opt=NULL);
     TObject *DrawClone(Option_t *opt=NULL) const;

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -170 +170 @@
     const MBinning *bins = (MBinning*)plist->FindObject("BinningCamera");
     if (!bins)
-        *fLog << warn << "Object 'BinningCamera' [MBinning] not found... no binning applied." << endl;
+    {
+        float r = geom ? geom->GetMaxRadius() : 600;
+        r *= 0.9;
+        if (!fUseMmScale)
+            r *= fMm2Deg;
+
+        MBinning b;
+        b.SetEdges(61, -r, r);
+        SetBinning(fCenter, &b, &b);
+    }
     else
         SetBinning(fCenter, bins, bins);
+
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -56 +56 @@
 #include "MLogManip.h"
 
+#include "MFillH.h"
+#include "MEvtLoop.h"
 #include "MParList.h"
+#include "MTaskList.h"
 
 #include "MData.h"
@@ -63 +66 @@
 ClassImp(MHMatrix);
 
-static const TString gsDefName  = "MHMatrix";
-static const TString gsDefTitle = "Multidimensional Matrix";
+const TString MHMatrix::gsDefName  = "MHMatrix";
+const TString MHMatrix::gsDefTitle = "Multidimensional Matrix";
 
 // --------------------------------------------------------------------------
@@ -105 +108 @@
 // event (row) was filled into the matrix. For the syntax of the rule
 // see MDataChain.
-//
-void MHMatrix::AddColumn(const char *rule)
+// Returns the index of the new column, -1 in case of failure.
+// (0, 1, 2, ... for the 1st, 2nd, 3rd, ...)
+//
+Int_t MHMatrix::AddColumn(const char *rule)
 {
     if (fM.IsValid())
     {
         *fLog << warn << "Warning - matrix is already in use. Can't add a new column... skipped." << endl;
-        return;
+        return -1;
+    }
+
+    if (TestBit(kIsLocked))
+    {
+        *fLog << warn << "Warning - matrix is locked. Can't add new column... skipped." << endl;
+        return -1;
     }
 
@@ -121 +132 @@
 
     fData->AddEntry(rule);
+    return fData->GetNumEntries()-1;
 }
 
@@ -128 +140 @@
     {
         *fLog << warn << "Warning - matrix is already in use. Can't add new columns... skipped." << endl;
+        return;
+    }
+
+    if (TestBit(kIsLocked))
+    {
+        *fLog << warn << "Warning - matrix is locked. Can't add new columns... skipped." << endl;
         return;
     }
@@ -519 +537 @@
     fM = m;
 }
+
+Bool_t MHMatrix::Fill(MParList *plist, MTask *read)
+{
+    //
+    // Read data into Matrix
+    //
+    const Bool_t is = plist->IsOwner();
+    plist->SetOwner(kFALSE);
+
+    MTaskList tlist;
+    plist->Replace(&tlist);
+
+    MFillH fillh(this);
+
+    tlist.AddToList(read);
+    tlist.AddToList(&fillh);
+
+    MEvtLoop evtloop;
+    evtloop.SetParList(plist);
+
+    if (!evtloop.Eventloop())
+        return kFALSE;
+
+    plist->Remove(&tlist);
+    plist->SetOwner(is);
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -1 +1 @@
 #ifndef MARS_MHMatrix
 #define MARS_MHMatrix
+
+#ifdef MARS_MLogManip
+#error Please make ensure that MLogManip.h are included _after_ MHMatrix.h
+#endif
 
 #ifndef ROOT_TMatrix
@@ -10 +14 @@
 
 class TArrayI;
+
+class MTask;
+class MParList;
 class MDataArray;
 
 class MHMatrix : public MH
 {
-protected:
+private:
+    static const TString gsDefName;  //! Default Name
+    static const TString gsDefTitle; //! Default Title
+
     Int_t   fNumRow;    //! Number of dimensions of histogram
+    Int_t   fRow;       //! Present row
     TMatrix fM;         // Matrix to be filled
 
@@ -23 +34 @@
 
     enum {
-        kIsOwner = BIT(14)
+        kIsOwner  = BIT(14),
+        kIsLocked = BIT(16)
     };
 
@@ -39 +51 @@
     ~MHMatrix();
 
-    void AddColumn(const char *name);
+    void Lock()   { SetBit(kIsLocked); }
+    void Unlock() { ResetBit(kIsLocked); }
+
+    Int_t AddColumn(const char *name);
     void AddColumns(MDataArray *mat);
 
@@ -45 +60 @@
 
     const TMatrix &GetM() const { return fM; }
+
+    Bool_t IsValid() const { return fM.IsValid(); }
+    Int_t  GetNumRows() const { return fNumRow; }
 
     //void Draw(Option_t *opt=NULL);
@@ -56 +74 @@
     Double_t CalcDist(const TVector &v, Int_t num = 25);
 
-    void SetIOwner(Bool_t b=kTRUE) { b ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
+    void SetOwner(Bool_t b=kTRUE) { b ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 
     void Reassign();
@@ -63 +81 @@
     void SortMatrixByColumn(Int_t ncol=0, Bool_t desc=kTRUE);
 
+    Bool_t SetNumRow(Int_t row) { if (row>=fNumRow || row<0) return kFALSE; fRow = row; return kTRUE; }
+    Int_t GetNumRow() const { return fRow; };
+    Double_t operator[](Int_t col) { return fM(fRow, col); }
+
+    Bool_t Fill(MParList *plist, MTask *read);
+
     ClassDef(MHMatrix, 1) // Multidimensional Matrix to store events
 };

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -73 +73 @@
     //   connect all the histogram with the container fHist
     //
-    fStarMap = new TH2F("StarMap", "2D Hillas Star Map",
+    fStarMap = new TH2F("StarMap", " 2D Hillas Star Map ",
                         150, -300, 300,
                         150, -300, 300);
@@ -96 +96 @@
 //
 // Setup the Binning for the histograms automatically if the correct
-// instances of MBinning (with the names 'BinningWidth' and 'BinningLength')
+// instances of MBinning (with the names 'BinningCamera')
 // are found in the parameter list
 // Use this function if you want to set the conversion factor which