Changeset 1574 for trunk/MagicSoft/Mars/mdata

Timestamp:

11/04/02 10:06:08 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MData.cc (modified) (2 diffs)
• MData.h (modified) (1 diff)
• MDataArray.cc (modified) (10 diffs)
• MDataArray.h (modified) (2 diffs)
• MDataChain.cc (modified) (8 diffs)
• MDataChain.h (modified) (1 diff)
• MDataElement.cc (modified) (1 diff)
• MDataList.cc (modified) (4 diffs)
• MDataList.h (modified) (1 diff)
• MDataMember.cc (modified) (2 diffs)
• MDataMember.h (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/MData.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002
@@ -44 +44 @@
 //      from the parlist.
 //
+//    - TString GetRule()
+//      returns the rule as a text which would recreate the same structure
+//      when used in a MDataChain
+//
+//    - TString GetDataMember()
+//      returns the names (seperated by a comma) used by this class. This
+//      is mainly used for the AutoScheme when reading data from a file.
+//      (s.MReadTree)
+//
+//   The 'must' ist represented by the =0 in the class header. In the C++
+//   language this is called an abstract member function. Because the
+//   class contains abstract member function which makes it impossible
+//   to create an instance of this class one calls it also:
+//   abstract base class
+//
 /////////////////////////////////////////////////////////////////////////////
 

trunk/MagicSoft/Mars/mdata/MData.h

@@ -21 +21 @@
     virtual Bool_t   PreProcess(const MParList *plist) = 0;
     virtual TString  GetRule() const = 0;
+    virtual TString  GetDataMember() const { return ""; }
 
     Double_t operator()() { return GetValue(); }

trunk/MagicSoft/Mars/mdata/MDataArray.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  08/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  08/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002
@@ -26 +26 @@
 //
 //   MDataArray
+//
+//   An Array of MData derived classes.
+//   It can be used, eg, in MHMatrix for description of the columns.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -42 +45 @@
 static const TString gsDefTitle = "Array to store MData cntainers";
 
+// --------------------------------------------------------------------------
+//
+// Constructor
+//
 MDataArray::MDataArray(const char *name, const char *title)
 {
@@ -48 +55 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Add a new data rule as a new entry (MDataChain)
+//
 void MDataArray::AddEntry(const TString rule)
 {
@@ -55 +66 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Add a new data as a new entry (MData). If the destructor of MDataArray
+// should delete the object set its bit kCanDelete
+//
+void MDataArray::AddEntry(MData *data)
+{
+    fList.Add(data);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the i-th entry
+//
 MData &MDataArray::operator[](Int_t i) const
 {
@@ -60 +85 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the data value of the i-th entry
+//
 Double_t MDataArray::operator()(Int_t i)
 {
@@ -65 +94 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// PreProcesses all members in the list
+//
 Bool_t MDataArray::PreProcess(const MParList *plist)
 {
@@ -82 +115 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Print the rules for all entries of the array
+//
 void MDataArray::Print(Option_t *opt) const
 {
@@ -102 +139 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Implementation of SavePrimitive. Used to write the call to a constructor
+// to a macro. In the original root implementation it is used to write
+// gui elements to a macro-file.
+//
 void MDataArray::StreamPrimitive(ofstream &out) const
 {
@@ -119 +162 @@
         out << "   " << GetUniqueName() << ".AddEntry(\"" << data->GetRule() << "\");" << endl;
 }
+
+// --------------------------------------------------------------------------
+//
+// Return the data members existing in this array in a comma-seperated list
+// (This is mainly used for MTask::AddToBranchList)
+//
+TString MDataArray::GetDataMember() const
+{
+    TString str;
+
+    TIter Next(&fList);
+    MData *data = NULL;
+    while ((data=(MData*)Next()))
+    {
+        if (data->GetDataMember().IsNull())
+            continue;
+
+        str += ",";
+        str += data->GetDataMember();
+    }
+    return str;
+}

trunk/MagicSoft/Mars/mdata/MDataArray.h

@@ -28 +28 @@
 
     void AddEntry(const TString rule);
+    void AddEntry(MData *data);
 
     MData &operator[](Int_t i) const;
@@ -33 +34 @@
 
     Bool_t PreProcess(const MParList *plist);
+
+    TString GetDataMember() const;
 
     void Print(Option_t *opt = "") const;

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002
@@ -95 +95 @@
 ClassImp(MDataChain);
 
+// --------------------------------------------------------------------------
+//
+//  Constructor which takes a rule and a surrounding operator as argument
+//
 MDataChain::MDataChain(const char *rule, OperatorType_t op)
     : fOperatorType(op)
@@ -104 +108 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  Default constructor
+//
 MDataChain::MDataChain()
     : fMember(NULL), fOperatorType(kENoop)
@@ -109 +117 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Constructor taking a rule as an argument. For more details see
+// class description
+//
 MDataChain::MDataChain(const char *rule, const char *name, const char *title)
     : fOperatorType(kENoop)
@@ -220 +233 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Core of the data chain. Here the chain is constructed out of the rule.
+//
 MData *MDataChain::ParseString(TString txt, Int_t level)
 {
@@ -420 +437 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Returns the value described by the rule
+//
 Double_t MDataChain::GetValue() const
 {
@@ -498 +519 @@
         */
 
+// --------------------------------------------------------------------------
+//
+// Builds a rule from all the chain members. This is a rule which could
+// be used to rebuild the chain.
+//
 TString MDataChain::GetRule() const
 {
@@ -541 +567 @@
     return str;
 }
+
+// --------------------------------------------------------------------------
+//
+// Return a comma seperated list of all data members used in the chain.
+// This is mainly used in MTask::AddToBranchList
+//
+TString MDataChain::GetDataMember() const
+{
+    return fMember->GetDataMember();
+}

trunk/MagicSoft/Mars/mdata/MDataChain.h

@@ -66 +66 @@
 
     TString GetRule() const;
+    TString GetDataMember() const;
 
     ClassDef(MDataChain, 1) // A chain/concatenation of MData objects

trunk/MagicSoft/Mars/mdata/MDataElement.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002

trunk/MagicSoft/Mars/mdata/MDataList.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002
@@ -182 +182 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// PreProcesses all members in the list
+//
 Bool_t MDataList::PreProcess(const MParList *plist)
 {
@@ -259 +263 @@
     */
 
+// --------------------------------------------------------------------------
+//
+// Builds a rule from all the list members. This is a rule which could
+// be used to rebuild the list using the constructor of a MDataChain
+//
 TString MDataList::GetRule() const
 {
@@ -306 +315 @@
     return str;
 }
+
+// --------------------------------------------------------------------------
+//
+// Return a comma seperated list of all data members used in the chain.
+// This is mainly used in MTask::AddToBranchList
+//
+TString MDataList::GetDataMember() const
+{
+    TString str;
+
+    TIter Next(&fMembers);
+
+    MData *member=(MData*)Next();
+
+    if (!member->GetDataMember().IsNull())
+        str += member->GetDataMember();
+
+    while ((member=(MData*)Next()))
+    {
+        if (!member->GetDataMember().IsNull())
+        {
+            str += ",";
+            str += member->GetDataMember();
+        }
+    }
+
+    return str;
+}

trunk/MagicSoft/Mars/mdata/MDataList.h

@@ -49 +49 @@
 //    void Print(Option_t *opt = "") const;
     TString GetRule() const;
+    TString GetDataMember() const;
 
     ClassDef(MDataList, 1) // A concatenation of MData objects by one operator

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  04/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002
@@ -170 +170 @@
 */
 
+// --------------------------------------------------------------------------
+//
+// Builds a rule which cn be used in a MDataChain to describe this object
+//
 TString MDataMember::GetRule() const
 {
     return fDataMember;
 }
+
+// --------------------------------------------------------------------------
+//
+// Returns the data member.
+// This is mainly used in MTask::AddToBranchList
+//
+TString MDataMember::GetDataMember() const
+{
+    return fDataMember;
+}

trunk/MagicSoft/Mars/mdata/MDataMember.h

@@ -37 +37 @@
     //void Print(Option_t *opt = "") const;
     TString GetRule() const;
+    TString GetDataMember() const;
 
     ClassDef(MDataMember, 1) // MData object corresponding to a single data member of a Mars container