Changeset 3788 for trunk/MagicSoft/Mars/mhbase

Timestamp:

04/21/04 15:38:08 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.cc (modified) (2 diffs)
• MBinning.h (modified) (2 diffs)
• MFillH.cc (modified) (3 diffs)
• MFillH.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -61 +61 @@
 
     SetEdges(10, 0, 1);
-
     fType = kIsDefault;
 }
 
+MBinning::MBinning(Int_t nbins, Axis_t lo, Axis_t hi, const char *name, const char *opt="", const char *title=NULL)
+{
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
+
+    SetEdges(nbins, lo, hi, opt);
+
+}
 void MBinning::SetEdges(const TAxis &axe)
 {
@@ -110 +117 @@
 
     fType = kIsLinear;
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls SetEdgesLog if opt contains "log"
+// Calls SetEdgesCos if opt contains "cos"
+// Calls SetEdges in all other cases
+//
+void MBinning::SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up, const char *opt)
+{
+    const TString o(opt);
+    if (o.Contains("log", TString::kIgnoreCase))
+    {
+        SetEdgesLog(nbins, lo, up);
+        return;
+    }
+    if (o.Contains("cos", TString::kIgnoreCase))
+    {
+        SetEdgesCos(nbins, lo, up);
+        return;
+    }
+    SetEdges(nbins, lo, up);
 }
 

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -32 +32 @@
 public:
     MBinning(const char *name=NULL, const char *title=NULL);
+    MBinning(Int_t nbins, Axis_t lo, Axis_t hi, const char *name, const char *opt="", const char *title=NULL);
 
     void SetEdges(const TArrayD &arr)
@@ -42 +43 @@
     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(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);

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -340 +340 @@
 // --------------------------------------------------------------------------
 //
+// Use this to set a draw option used when drawing automatically to the
+// status display.
+//
+void MFillH::SetDrawOption(Option_t *option="")
+{
+    fDrawOption = option;
+}
+
+// --------------------------------------------------------------------------
+//
 // Creates a new tab in a status display with the name of the MH class,
 // if fDisplay is set and the MH-class overwrites the Draw function
@@ -357 +367 @@
 
     fCanvas = &fDisplay->AddTab(fNameTab.IsNull() ? fH->GetName() : fNameTab.Data());
-    fH->Draw();
+    fH->Draw(fDrawOption);
 
     return kTRUE;
@@ -549 +559 @@
     if (fDisplay && fDisplay->HasCanvas(fCanvas))
     {
+        const TString opt(Form("nonew %s", fDrawOption));
         fCanvas->cd();
-        fH->DrawClone("nonew");
+        fH->DrawClone(opt);
         fCanvas->Modified();
         fCanvas->Update();

trunk/MagicSoft/Mars/mhbase/MFillH.h

@@ -38 +38 @@
     TCanvas *fCanvas;             //! Canvas used to update a MStatusDisplay at the end of a loop
 
+    TString fDrawOption;          // Draw option for status display
+
     TString ExtractName(const char *name) const;
     TString ExtractClass(const char *name) const;
@@ -63 +65 @@
     void SetWeight(const char *name) { fWeightName = name; }
 
+    void      SetDrawOption(Option_t *option="");
+    Option_t *GetDrawOption() const { return fDrawOption; }
+
     Int_t  PreProcess(MParList *pList);
     Bool_t ReInit(MParList *pList);