Changeset 1477 for trunk/MagicSoft/Mars/mhist

Timestamp:

08/02/02 15:20:53 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

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

trunk/MagicSoft/Mars/mhist/MBinning.cc

@@ -50 +50 @@
 
     SetEdges(10, 0, 1);
+
+    fType = kIsDefault;
 }
 
+// --------------------------------------------------------------------------
+//
+// Specify the number of bins (not the number of edges), the lowest and
+// highest Edge.
+//
+void MBinning::SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up)
+{
+    const Double_t binsize = (up-lo)/nbins;
+    fEdges.Set(nbins+1);
+    for (int i=0; i<=nbins; i++)
+            fEdges[i] = binsize*i + lo;
+
+    fType = kIsLinear;
+}
+
+// --------------------------------------------------------------------------
+//
+// Specify the number of bins (not the number of edges), the lowest and
+// highest Edge.
+//
+void MBinning::SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up)
+{
+    // if (lo==0) ...
+
+    const Double_t binsize = log10(up/lo)/nbins;
+    fEdges.Set(nbins+1);
+    for (int i=0; i<=nbins; i++)
+        fEdges[i] = pow(10, binsize*i) * lo;
+
+    fType = kIsLogarithmic;
+}
 
 // --------------------------------------------------------------------------
@@ -70 +103 @@
 // gui elements to a macro-file.
 //
-void MBinning::SavePrimitive(ofstream &out, Option_t *o)
+void MBinning::StreamPrimitive(ofstream &out) const
 {
-    out << "   TArrayD dummy;" << endl;
-    for (int i=0; i<fEdges.GetSize(); i++)
-        out << "   dummy[" << i << "]=" << fEdges[i] << ";" << endl;
     out << "   MBinning " << ToLower(fName) << "(\"";
     out << fName << "\", \"" << fTitle << "\");" << endl;
-    out << "   " << ToLower(fName) << ".SetEdges(dummy);" << endl;
+
+    if (IsDefault())
+        return;
+
+    if (IsLinear() || IsLogarithmic())
+    {
+        out << "   " << ToLower(fName) << ".SetEdges";
+        if (IsLogarithmic())
+            out << "Log";
+        out << "(" << GetNumBins() << ", " << GetEdgeLo() << ", " << GetEdgeHi() << ");" << endl;
+        return;
+    }
+
+    out << "   {" << endl;
+    out << "      TArrayD dummy;" << endl;
+    for (int i=0; i<GetNumEdges(); i++)
+        out << "      dummy[" << i << "]=" << GetEdges()[i] << ";" << endl;
+    out << "      " << ToLower(fName) << ".SetEdges(dummy);" << endl;
+    out << "   }" << endl;
 }

trunk/MagicSoft/Mars/mhist/MBinning.h

@@ -17 +17 @@
     TArrayD fEdges;
 
+    Byte_t  fType;
+
+    void StreamPrimitive(ofstream &out) const;
+
+    enum {
+        kIsDefault,
+        kIsLinear,
+        kIsLogarithmic,
+        kIsUserArray
+    };
+
 public:
     MBinning(const char *name=NULL, const char *title=NULL);
@@ -23 +34 @@
     {
         fEdges = arr;
+        fType = kIsUserArray;
     }
 
-    void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up)
-    {
-        const Double_t binsize = (up-lo)/nbins;
-        fEdges.Set(nbins+1);
-        for (int i=0; i<=nbins; i++)
-            fEdges[i] = binsize*i + lo;
-    }
-
-    void SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up)
-    {
-        // if (lo==0) ...
-
-        const Double_t binsize = log10(up/lo)/nbins;
-        fEdges.Set(nbins+1);
-        for (int i=0; i<=nbins; i++)
-            fEdges[i] = pow(10, binsize*i) * lo;
-    }
+    void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up);
+    void SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up);
 
     // FIXME: ROOT workaround: "operator[] const" missing
-    Double_t GetEdgeLo() const { return (*(TArrayD*)(&fEdges))[0]; }
-    Double_t GetEdgeHi() const { return (*(TArrayD*)(&fEdges))[fEdges.GetSize()-1]; }
+    Double_t GetEdgeLo() const { return ((TArrayD)fEdges)[0]; }
+    Double_t GetEdgeHi() const { return ((TArrayD)fEdges)[fEdges.GetSize()-1]; }
 
     Int_t GetNumEdges() const { return fEdges.GetSize(); }
@@ -52 +49 @@
     Double_t *GetEdges() const { return fEdges.GetArray(); }
 
+    Bool_t IsLinear() const { return fType==kIsLinear; }
+    Bool_t IsLogarithmic() const { return fType==kIsLogarithmic; }
+    Bool_t IsDefault() const { return fType==kIsDefault; }
+    Bool_t IsUserArray() const { return fType==kIsUserArray; }
+
     void Apply(TH1 &);
-
-    void SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MBinning, 1) //Container to store the binning of a histogram

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -156 +156 @@
 //
 //
-MFillH::MFillH(const char *hist, const MParContainer *par, const char *name, const char *title)
+MFillH::MFillH(const char *hist, MParContainer *par, const char *name, const char *title)
 {
     Init(name, title);
@@ -192 +192 @@
 //   derived from MH)
 //
-MFillH::MFillH(MH *hist, const MParContainer *par, const char *name, const char *title)
+MFillH::MFillH(MH *hist, MParContainer *par, const char *name, const char *title)
 {
     Init(name, title);
@@ -350 +350 @@
 // gui elements to a macro-file.
 //
-void MFillH::SavePrimitive(ofstream &out, Option_t *o)
-{
-    out << "   MFillH " << ToLower(fName) << "(\"";
-    out << fHName << "\", \"" << fParContainerName << "\");" << endl;
-}
+void MFillH::StreamPrimitive(ofstream &out) const
+{
+    if (fH)
+        fH->SavePrimitive(out);
+
+    if (fParContainer)
+        fParContainer->SavePrimitive(out);
+
+    out << "   MFillH " << ToLower(fName) << "(";
+
+    if (fH)
+        out << "&" << ToLower(fH->GetName());
+    else
+        out << "\"" << fHName << "\"";
+    out << ", ";
+
+    if (fParContainer)
+        out << "&" << ToLower(fParContainer->GetName());
+    else
+        out << "\"" << fParContainerName << "\"";
+
+    out << ");" << endl;
+}

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -12 +12 @@
 {
 private:
-    const MParContainer *fParContainer; //!
+    MParContainer *fParContainer;
     TString fParContainerName;
 
-    MH* fH;                             //!
+    MH* fH;                   
     TString fHName;
 
@@ -23 +23 @@
     void Init(const char *name, const char *title);
 
+    void StreamPrimitive(ofstream &out) const;
+
 public:
     MFillH();
-    MFillH(const char *hist, const char *par=NULL,     const char *name=NULL, const char *title=NULL);
-    MFillH(const char *hist, const MParContainer *par, const char *name=NULL, const char *title=NULL);
-    MFillH(MH *hist,         const char *par=NULL,     const char *name=NULL, const char *title=NULL);
-    MFillH(MH *hist,         const MParContainer *par, const char *name=NULL, const char *title=NULL);
+    MFillH(const char *hist, const char *par=NULL, const char *name=NULL, const char *title=NULL);
+    MFillH(const char *hist, MParContainer *par,   const char *name=NULL, const char *title=NULL);
+    MFillH(MH *hist,         const char *par=NULL, const char *name=NULL, const char *title=NULL);
+    MFillH(MH *hist,         MParContainer *par,   const char *name=NULL, const char *title=NULL);
 
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
     Bool_t PostProcess();
-
-    void SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MFillH, 1) // Task to fill a histogram with data from a parameter container

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -384 +384 @@
 // gui elements to a macro-file.
 //
-void MH3::SavePrimitive(ofstream &out, Option_t *o)
+void MH3::StreamPrimitive(ofstream &out)
 {
     TString name = ToLower(fName);

trunk/MagicSoft/Mars/mhist/MH3.h

@@ -23 +23 @@
     MDataChain *fData[3];        // Object from which the data is filled
     Double_t    fScale[3];
+
+    void StreamPrimitive(ofstream &out);
 
 public:
@@ -49 +51 @@
     TObject *DrawClone(Option_t *opt=NULL) const;
 
-    void SavePrimitive(ofstream &out, Option_t *o="");
-
     ClassDef(MH3, 1) // Generalized 1/2/3D-histogram for Mars variables
 };