Changeset 7413 for trunk/MagicSoft/Mars/mhbase

Timestamp:

11/21/05 11:09:12 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.cc (modified) (4 diffs)
• MBinning.h (modified) (1 diff)
• MH3.cc (modified) (1 diff)
• MHMatrix.cc (modified) (1 diff)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -242 +242 @@
 // lowest <lo> and highest <up> Edge (of your histogram)
 //
-void MBinning::SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up)
-{
+void MBinning::SetEdgesLin(Int_t nbins, Axis_t lo, Axis_t up)
+{
+    if (nbins<=0)
+    {
+        *fLog << warn << "WARNING - Number of bins cannot be <= 0... reset to 1." << endl;
+        nbins = 1;
+    }
+
+    if (up<lo)
+    {
+        *fLog << warn << "WARNING - Upper edge must be greater than lower edge... exchanging." << endl;
+
+        const Axis_t dummy(lo);
+        lo = up;
+        up = dummy;
+    }
+
     const Double_t binsize = nbins<=0 ? 0 : (up-lo)/nbins;
     fEdges.Set(nbins+1);
@@ -402 +417 @@
 // lowest <lo> and highest <up> Edge (of your histogram)
 //
-void MBinning::SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up)
+void MBinning::SetEdgesLog(Int_t nbins, Axis_t lo, Axis_t up)
 {
     // if (lo==0) ...
+    if (nbins<=0)
+    {
+        *fLog << warn << "WARNING - Number of bins cannot be <= 0... reset to 1." << endl;
+        nbins = 1;
+    }
+
+    if (up<lo)
+    {
+        *fLog << warn << "WARNING - Upper edge must be greater than lower edge... exchanging." << endl;
+
+        const Axis_t dummy(lo);
+        lo = up;
+        up = dummy;
+    }
 
     const Double_t binsize = log10(up/lo)/nbins;
@@ -419 +448 @@
 // lowest [deg] <lo> and highest [deg] <up> Edge (of your histogram)
 //
-void MBinning::SetEdgesCos(const Int_t nbins, const Axis_t lo, Axis_t up)
-{
+void MBinning::SetEdgesCos(Int_t nbins, Axis_t lo, Axis_t up)
+{
+    if (nbins<=0)
+    {
+        *fLog << warn << "WARNING - Number of bins cannot be <= 0... reset to 1." << endl;
+        nbins = 1;
+    }
+
+    if (up<lo)
+    {
+        *fLog << warn << "WARNING - Upper edge must be greater than lower edge... exchanging." << endl;
+
+        const Axis_t dummy(lo);
+        lo = up;
+        up = dummy;
+    }
+
     // if (lo==0) ...
     const Axis_t ld = lo/kRad2Deg;
@@ -436 +480 @@
 // lowest [deg] <lo> and highest [deg] <up> Edge (of your histogram)
 //
-void MBinning::SetEdgesASin(const Int_t nbins, Axis_t lo, Axis_t up)
-{
+void MBinning::SetEdgesASin(Int_t nbins, Axis_t lo, Axis_t up)
+{
+    if (nbins<=0)
+    {
+        *fLog << warn << "WARNING - Number of bins cannot be <= 0... reset to 1." << endl;
+        nbins = 1;
+    }
+
+    if (up<lo)
+    {
+        *fLog << warn << "WARNING - Upper edge must be greater than lower edge... exchanging." << endl;
+
+        const Axis_t dummy(lo);
+        lo = up;
+        up = dummy;
+    }
+
     const Double_t binsize = nbins<=0 ? 0 : (up-lo)/nbins;
     fEdges.Set(nbins+1);

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -62 +62 @@
     void SetEdges(const MBinning &bins) { SetEdges(bins.fEdges); fType = bins.fType; fTitle = bins.fTitle; }
     void SetEdges(const TH1 &h, const Char_t axis='x');
-    void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up);
+    void SetEdges(Int_t nbins, const Axis_t lo, const Axis_t up) { SetEdgesLin(nbins, lo, up); }
     void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up, const char *opt);
-    void SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up);
-    void SetEdgesCos(const Int_t nbins, const Axis_t lo, Axis_t up);
-    void SetEdgesASin(const Int_t nbins, Axis_t lo, Axis_t up);
+    void SetEdgesLin(Int_t nbins, Axis_t lo, Axis_t up);
+    void SetEdgesLog(Int_t nbins, Axis_t lo, Axis_t up);
+    void SetEdgesCos(Int_t nbins, Axis_t lo, Axis_t up);
+    void SetEdgesASin(Int_t nbins, Axis_t lo, Axis_t up);
 
     Int_t FindLoEdge(Double_t val) const

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -561 +561 @@
     TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
     pad->SetBorderMode(0);
+    pad->SetGridx();
+    pad->SetGridy();
 
     fHist->SetFillStyle(4000);

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -209 +209 @@
 }
 
+void MHMatrix::AddColumns(const TCollection &list)
+{
+    TIter Next(&list);
+    TObject *obj = 0;
+    while ((obj=Next()))
+        AddColumn(obj->GetName());
+}
+
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mhbase/MHMatrix.h

@@ -73 +73 @@
     Int_t AddColumn(const char *name);
     void AddColumns(MDataArray *mat);
+    void AddColumns(const TCollection &list);
 
     //MDataArray *GetColumns() { return fData; }