Changeset 1209 for trunk/MagicSoft/Mars/mhist

Timestamp:

01/22/02 17:32:15 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MFillH.cc (modified) (6 diffs)
• MFillH.h (modified) (1 diff)
• MHHillas.h (modified) (1 diff)
• MHHillasSrc.cc (modified) (4 diffs)
• MHHillasSrc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -30 +30 @@
 //  histogram which is derived from MH can be filled with this task.        //
 //                                                                          //
-//  You must specifiy the parameter container with which data the histogram //
-//  container should be filled, and the histogram container which has       //
-//  to be filled. This can be done by either specifing the name of the      //
-//  objects in the parameter list or by specifiing a pointer to the object. //
-//  (s. Constructor)                                                        //
+//  There are two options to use:                                           //
+//                                                                          //
+//  1) You specifiy the parameter container with which data the             //
+//     histogram container should be filled, and the histogram container    //
+//     which has to be filled. This can be done by either specifing the     //
+//     name of the objects in the parameter list or by specifiing a pointer //
+//     to the object. (s. Constructor)                                      //                  //
+//                                                                          //
+//  2) You specify the name and/or type of the histogram to become filled.  //
+//     Any other action imust be taken by the histogram class.              //
+//                                                                          //
+//  PreProcess: In the preprocessing of this task we setup all pointers     //
+//              to instances which are needed and call FillSetup of the     //
+//              histogram class with the parameter list as an argument.     //
+//                                                                          //
+//  Process: The process function calls the Fill member function of the     //
+//           histogram class instance (inheriting from MH) with either      //
+//           a NULL pointer or a pointer to the corresponding container     //
+//           as an argument.                                                //
 //                                                                          //
 //  WARNING:                                                                //
@@ -81 +95 @@
 // Constructor.
 //
-// - par is the name of the parameter container which should be filled into
-//   the histogram
-// - hist is the name of the histogram container (which must have been
-//   derived from MH)
-//
-MFillH::MFillH(const char *par, const char *hist, const char *name, const char *title)
+// 1) - par is the name of the parameter container which should be filled into
+//      the histogram
+//    - hist is the name of the histogram container (which must have been
+//      derived from MH)
+//
+//    In this case MH::Fill is called with a pointer to the corresponding
+//    histogram instance.
+//
+// 2) - hist is the name and/or type of the histogram.
+//      1) The name and type is identical, eg: "MHHillas"
+//      2) They are not identical, eg: "MyHistogram [MHHillas]"
+//         This searches for a class instance of MHHillas with the name
+//         "MyHistogram". If it doesn't exist one is created.
+//
+//    In this case PreProcess calls MH::SetupFill with a pointer to the
+//    parameter list and MH::Fill is called with a NULL-pointer.
+//
+MFillH::MFillH(const char *hist, const char *par, const char *name, const char *title)
 {
     Init(name, title);
 
     fHName = hist;
+    fParContainerName = par;
+}
+
+// --------------------------------------------------------------------------
+//
+// Constructor.
+//
+// 1) - par is a pointer to the instance of your parameter container from which
+//      the data should be used to fill the histogram.
+//    - hist is the name of the histogram container (which must have been
+//      derived from MH)
+//
+//    In this case MH::Fill is called with a pointer to the corresponding
+//    histogram instance.
+//
+// 2) - hist is the name and/or type of the histogram.
+//      1) The name and type is identical, eg: "MHHillas"
+//      2) They are not identical, eg: "MyHistogram [MHHillas]"
+//         This searches for a class instance of MHHillas with the name
+//         "MyHistogram". If it doesn't exist one is created. Everything
+//         which is between the first '[' and the last ']' in the string
+//         is used as the histogram type.
+//
+//    In this case PreProcess calls MH::SetupFill with a pointer to the
+//    parameter list and MH::Fill is called with a NULL-pointer.
+//
+//
+MFillH::MFillH(const char *hist, const MParContainer *par, const char *name, const char *title)
+{
+    Init(name, title);
+
+    fHName = hist;
+    fParContainer = par;
+    fParContainerName = par->GetName();
+}
+
+// --------------------------------------------------------------------------
+//
+// Constructor.
+//
+// - par is a pointer to the instance of your parameter container from which
+//   the data should be used to fill the histogram.
+// - hist is a pointer to the instance of your histogram container (which must
+//   have been derived from MH) into which the data should flow
+//
+MFillH::MFillH(MH *hist, const char *par, const char *name, const char *title)
+{
+    Init(name, title);
+
+    fH = hist;
+    fHName = hist->GetName();
     fParContainerName = par;
 }
@@ -103 +180 @@
 //   derived from MH)
 //
-MFillH::MFillH(const MParContainer *par, const char *hist, const char *name, const char *title)
-{
-    Init(name, title);
-
-    fHName = hist;
-    fParContainer = par;
-    fParContainerName = par->GetName();
-}
-
-// --------------------------------------------------------------------------
-//
-// Constructor.
-//
-// - par is a pointer to the instance of your parameter container from which
-//   the data should be used to fill the histogram.
-// - hist is a pointer to the instance of your histogram container (which must
-//   have been derived from MH) into which the data should flow
-//
-MFillH::MFillH(const char *par, MH *hist, const char *name, const char *title)
-{
-    Init(name, title);
-
-    fH = hist;
-    fHName = hist->GetName();
-    fParContainerName = par;
-}
-
-// --------------------------------------------------------------------------
-//
-// Constructor.
-//
-// - par is a pointer to the instance of your parameter container from which
-//   the data should be used to fill the histogram.
-// - hist is the name of the histogram container (which must have been
-//   derived from MH)
-//
-MFillH::MFillH(const MParContainer *par, MH *hist, const char *name, const char *title)
+MFillH::MFillH(MH *hist, const MParContainer *par, const char *name, const char *title)
 {
     Init(name, title);
@@ -147 +188 @@
     fParContainer = par;
     fParContainerName = par->GetName();
+}
+
+TString MFillH::ExtractName(const char *name) const
+{
+    TString type = name;
+
+    const Ssiz_t first = type.First('[');
+    const Ssiz_t last  = type.First(']');
+
+    if (!first || !last || first>=last)
+        return type;
+
+    return type.Remove(first).Strip(TString::kBoth);
+}
+
+TString MFillH::ExtractClass(const char *name) const
+{
+    TString type = name;
+
+    const Ssiz_t first = type.First('[');
+    const Ssiz_t last  = type.First(']');
+
+    if (!first || !last || first>=last)
+        return type;
+
+    const Ssiz_t length = last-first-1;
+
+    TString strip = fHName(first+1, length);
+    return strip.Strip(TString::kBoth);
 }
 
@@ -159 +229 @@
 Bool_t MFillH::PreProcess(MParList *pList)
 {
-    if (!fParContainer)
+    //
+    // Try to get the histogram container with name fHName from list
+    // or create one with this name
+    //
+    if (!fH)
     {
-        fParContainer = (MParContainer*)pList->FindObject(fParContainerName);
-        if (!fParContainer)
+        const TString cls  = ExtractClass(fHName);
+        const TString name = ExtractName(fHName);
+
+        TObject *obj = pList->FindCreateObj(cls, name);
+        if (!obj)
+            return kFALSE;
+
+        //
+        // We were successfull getting it. Check whether it really inherits
+        // from MH, FindCreateObj does only check for inheritance from
+        // 'type'.
+        //
+        if (!obj->InheritsFrom(MH::Class()))
         {
-            *fLog << err << dbginf << fParContainerName << " [MParContainer] not found... aborting." << endl;
+            *fLog << err << dbginf << obj->GetName() << " doesn't inherit ";
+            *fLog << "from MH - cannot be used for MFillH... aborting." << endl;
             return kFALSE;
         }
+
+        fH = (MH*)obj;
     }
 
-    if (!fH)
+    //
+    // Now we have the histogram container available. Try to Setup Fill.
+    //
+    if (!fH->SetupFill(pList))
     {
-        fH = (MH*)pList->FindCreateObj(fHName);
-        if (!fH)
-            return kFALSE;
-    }
-
-    if (!fH->InheritsFrom("MH"))
-    {
-        *fLog << err << dbginf << fH->GetDescriptor() << " ";
-        *fLog << "doesn't inherit from MH - cannot be used for MFillH... aborting." << endl;
+        *fLog << err << dbginf << "Error: calling SetupFill for ";
+        *fLog << fH->GetDescriptor() << "... aborting." << endl;
         return kFALSE;
     }
 
-    return kTRUE;
+    //
+    // If also a parameter container is already set we are done.
+    //
+    if (fParContainer)
+        return kTRUE;
+
+    //
+    // If a name is given try to find the input container in the
+    // list. If it could not be found we cannot proceed.
+    //
+    fParContainer = (MParContainer*)pList->FindObject(fParContainerName);
+    if (fParContainer)
+        return kTRUE;
+
+    *fLog << err << dbginf << fParContainerName << " [MParContainer] not found... aborting." << endl;
+    return kFALSE;
 }
 
@@ -192 +291 @@
 Bool_t MFillH::Process()
 {
-    fH->Fill(fParContainer);
-
-    return kTRUE;
+    return fH->Fill(fParContainer);
 } 
 

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -18 +18 @@
     TString fHName;
 
+    TString ExtractName(const char *name) const;
+    TString ExtractClass(const char *name) const;
+
     void Init(const char *name, const char *title);
 
 public:
-    MFillH(const char *par,          const char *hist, const char *name=NULL, const char *title=NULL);
-    MFillH(const MParContainer *par, const char *hist, const char *name=NULL, const char *title=NULL);
-    MFillH(const char *par,          MH *hist,         const char *name=NULL, const char *title=NULL);
-    MFillH(const MParContainer *par, MH *hist,         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, 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);
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mhist/MHHillas.h

@@ -27 +27 @@
     TObject *DrawClone(Option_t *opt=NULL) const;
 
-    ClassDef(MHHillas, 1) // Container which hilds hostograms for the Hillas parameters
+    ClassDef(MHHillas, 1) // Container which holds histograms for length and width
 };
 

trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc

@@ -100 +100 @@
 // --------------------------------------------------------------------------
 //
-// Draw clones of all four histograms. So that the object can be deleted
+// Draw clones of all two histograms. So that the object can be deleted
 // and the histograms are still visible in the canvas.
 // The cloned object are deleted together with the canvas if the canvas is
@@ -108 +108 @@
 TObject *MHHillasSrc::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Hillas Parameters",
+    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Source dependant Parameters",
                                350, 500);
     c->Divide(1, 2);
+
+    // FIXME: Display Source position
 
     gROOT->SetSelectedPad(NULL);
@@ -131 +133 @@
 // --------------------------------------------------------------------------
 //
-// Creates a new canvas and draws the four histograms into it.
+// Creates a new canvas and draws the two histograms into it.
 // Be careful: The histograms belongs to this object and won't get deleted
 // together with the canvas.
@@ -138 +140 @@
 {
     if (!gPad)
-        MakeDefCanvas("Hillas", "Histograms of Hillas Parameters", 350, 500);
+        MakeDefCanvas("Hillas", "Histograms of Src dependant Parameters", 350, 500);
+
+    // FIXME: Display Source position
 
     gPad->Divide(1, 2);

trunk/MagicSoft/Mars/mhist/MHHillasSrc.h

@@ -27 +27 @@
     TObject *DrawClone(Option_t *opt=NULL) const;
 
-    ClassDef(MHHillasSrc, 1) // Container which hilds hostograms for the Hillas parameters
+    ClassDef(MHHillasSrc, 1) // Container which holds histograms for the source dependant parameters
 };