Changeset 1483

Timestamp:

08/05/02 16:12:14 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MHillasSrcCalc.cc (modified) (1 diff)
• manalysis/MImgCleanStd.cc (modified) (1 diff)
• manalysis/MSrcPosCam.cc (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (1 diff)
• mbase/MParContainer.cc (modified) (4 diffs)
• mbase/MParContainer.h (modified) (1 diff)
• mbase/MParList.cc (modified) (4 diffs)
• mbase/MTaskList.cc (modified) (3 diffs)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.cc (modified) (2 diffs)
• mfilter/MF.cc (modified) (1 diff)
• mfilter/MFAlpha.cc (modified) (1 diff)
• mfilter/MFDataMember.cc (modified) (1 diff)
• mfilter/MFParticleId.cc (modified) (1 diff)
• mfilter/MFTriggerLvl1.cc (modified) (1 diff)
• mhist/MBinning.cc (modified) (5 diffs)
• mhist/MFillH.cc (modified) (1 diff)
• mhist/MH3.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -39 +39 @@
    * mhist/MH3.[h,cc]:
      - added the missing const-qualifier of StreamPrimitive
+
+   * mbase/MParContainer.[h,cc]:
+     - implemented setting a unique id in SavePrimitive
+     - imnplemented GetUniqueID 
+     
+   * manalysis/MHillasSrcCalc.cc, manalysis/MImgCleanStd.cc,
+     manalysis/MSrcPosCam.cc, mbase/MEvtLoop.cc, mbase/MParList.cc,
+     mbase/MTaskList.cc, mfileio/MReadTree.cc, mfileio/MWriteRootFile.cc,
+     mhist/MF.cc, mfilter/MFAlpha.cc, mfilter/MFDataMember.cc,
+     mfilter/MFParticleId.cc, mfilter/MFTriggerLvl1.cc, mhist/MBinning.cc,
+     mhist/MFillH.cc, mhist/MH3.cc:
+     - changed the 'instance' name to the UniqueName
+     - in some files: implemented a static constant name and title, which
+       is used to descide whether the name and/or title should be stream
+       in the constructor-call in StreamPrimitive
 
 

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

@@ -115 +115 @@
         fHillasSrc->SavePrimitive(out);
 
-    out << "   MHillasSrcCalc " << ToLower(fName) << "(";
+    out << "   MHillasSrcCalc " << GetUniqueName() << "(";
 
     if (fSrcPos)
-        out << "&" << ToLower(fSrcPos->GetName());
+        out << "&" << fSrcPos->GetUniqueName();
     else
         out << "\"" << fSrcName << "\"";
 
     if (fHillasSrc)
-        out << "&" << ToLower(fHillasSrc->GetName());
+        out << "&" << fHillasSrc->GetUniqueName();
     else
         out << "\"" << fHillasName << "\"";

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -416 +416 @@
 void MImgCleanStd::StreamPrimitive(ofstream &out) const
 {
-    out << "   MImgCleanStd " << ToLower(fName) << "(";
+    out << "   MImgCleanStd " << GetUniqueName() << "(";
     out << fCleanLvl1 << ", " << fCleanLvl2 << ", \"";
     out << fName << "\", \"" << fTitle << "\");" << endl;

trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc

@@ -90 +90 @@
 void MSrcPosCam::StreamPrimitive(ofstream &out) const
 {
-    out << "   MSrcPosCam " << ToLower(fName) << "(\"";
+    out << "   MSrcPosCam " << GetUniqueName() << "(\"";
     out << fName << "\", \"" << fTitle << "\");" << endl;
 
-    out << "   " << ToLower(fName) << ".SetXY(" << fX << ", " << fY << ");" << endl;}
+    out << "   " << GetUniqueName() << ".SetXY(" << fX << ", " << fY << ");" << endl;}

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -371 +371 @@
     out << "   MEvtLoop evtloop;" << endl;
     if (fParList)
-        out << "   evtloop.SetParList(&" << ToLower(fParList->GetName()) << ");" << endl;
+        out << "   evtloop.SetParList(&" << fParList->GetUniqueName() << ");" << endl;
     else
         out << "   // fParList empty..." << endl;

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -37 +37 @@
 #include "MParContainer.h"
 
+#include <ctype.h>       // isdigit
 #include <fstream.h>     // ofstream, AsciiWrite
 
@@ -139 +140 @@
 // --------------------------------------------------------------------------
 //
+//  Return a unique name for this container. It is created from
+//  the container name and the unique Id. (This is mostly used
+//  in the StreamPrimitive member functions)
+//
+const TString MParContainer::GetUniqueName() const
+{
+    TString ret = ToLower(fName);
+
+    if (isdigit(ret[ret.Length()-1]))
+        ret+="_";
+
+    ret+=GetUniqueID();
+
+    return ret;
+}
+
+// --------------------------------------------------------------------------
+//
 //  List MParContainer name and title.
 //
@@ -359 +378 @@
 void MParContainer::SavePrimitive(ofstream &out, Option_t *o)
 {
+    static UInt_t uid = 0;
+
     if (IsSavedAsPrimitive())
         return;
 
+    SetUniqueID(uid++/*gRandom->Uniform(kMaxInt)*/);
     StreamPrimitive(out);
     SetBit(kIsSavedAsPrimitive);
@@ -373 +395 @@
 {
     out << "   // Using MParContainer::StreamPrimitive" << endl;
-    out << "   " << ClassName() << " " << ToLower(fName) << "(\"";
+    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";
     out << fName << "\", \"" << fTitle << "\");" << endl;
 }

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -55 +55 @@
     virtual void        FillBuffer(char *&buffer);
 
-    virtual const char *GetDescriptor() const { return Form("%s [%s]", fName.Data(), ClassName()); }
-    virtual const char *GetName() const       { return fName.Data(); }
-    virtual const char *GetTitle() const      { return fTitle.Data(); }
-    virtual ULong_t     Hash() const          { return fName.Hash(); }
-    virtual Bool_t      IsSortable() const    { return kTRUE; }
+    virtual const char   *GetDescriptor() const { return Form("%s [%s]", fName.Data(), ClassName()); }
+    virtual const TString GetUniqueName() const;
+    virtual const char   *GetName() const       { return fName.Data(); }
+    virtual const char   *GetTitle() const      { return fTitle.Data(); }
+    virtual ULong_t       Hash() const          { return fName.Hash(); }
+    virtual Bool_t        IsSortable() const    { return kTRUE; }
 
     virtual void        SetName(const char *name); // *MENU*

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -52 +52 @@
 ClassImp(MParList);
 
+static const TString gsDefName  = "MParList";
+static const TString gsDefTitle = "A list of Parameter Containers";
+
 // --------------------------------------------------------------------------
 //
@@ -59 +62 @@
 MParList::MParList(const char *name, const char *title)
 {
-    fName  = name  ? name  : "MParList";
-    fTitle = title ? title : "A list of Parameter Containers";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     //
@@ -668 +671 @@
 void MParList::StreamPrimitive(ofstream &out) const
 {
-    out << "   MParList " << ToLower(fName) << "(\"";
-    out << fName << "\", \"" << fTitle << "\");" << endl << endl;
+    out << "   MParList " << GetUniqueName();
+    if (fName!=gsDefName)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+        out <<")";
+    }
+    out << ";" << endl << endl;
 
     TIter Next(fContainer);
 
-    TObject *cont = NULL;
-    while ((cont=Next()))
+    MParContainer *cont = NULL;
+    while ((cont=(MParContainer*)Next()))
     {
         cont->SavePrimitive(out, "");
 
-        out << "   " << ToLower(fName) << ".AddToList(&";
-        out << ToLower(cont->GetName()) << ");" << endl << endl;
-    }
-}
-
+        out << "   " << GetUniqueName() << ".AddToList(&";
+        out << cont->GetUniqueName() << ");" << endl << endl;
+    }
+}
+
+// --------------------------------------------------------------------------
+//
+// Adds one TNamed object per object in the list. The TNamed object must
+// be deleted by the user.
+//
 void MParList::GetNames(TObjArray &arr) const
 {
@@ -689 +704 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Sets name and title of each object in the list from the objects in
+// the array.
+//
 void MParList::SetNames(TObjArray &arr)
 {

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -71 +71 @@
 ClassImp(MTaskList);
 
+static const TString gsDefName  = "MTaskList";
+static const TString gsDefTitle = "A list for tasks to be executed";
 // --------------------------------------------------------------------------
 //
@@ -79 +81 @@
 MTaskList::MTaskList(const char *name, const char *title)
 {
-    fName  = name  ? name  : "MTaskList";
-    fTitle = title ? title : "A list for tasks to be executed";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     fTasks = new TList;
@@ -522 +524 @@
 void MTaskList::StreamPrimitive(ofstream &out) const
 {
-    out << "   MTaskList " << ToLower(fName) << "(\"";
-    out << fName << "\", \"" << fTitle << "\");" << endl << endl;
+    out << "   MTaskList " << GetUniqueName();
+    if (fName!=gsDefName)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+        out <<")";
+    }
+    out << ";" << endl << endl;
 
     TIter Next(fTasks);
 
-    TObject *cont = NULL;
-    while ((cont=Next()))
+    MParContainer *cont = NULL;
+    while ((cont=(MParContainer*)Next()))
     {
         cont->SavePrimitive(out, "");
-        out << "   " << ToLower(fName) << ".AddToList(&";
-        out << ToLower(cont->GetName()) << ");" << endl << endl;
+        out << "   " << GetUniqueName() << ".AddToList(&";
+        out << cont->GetUniqueName() << ");" << endl << endl;
     }
 }

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -785 +785 @@
 void MReadTree::StreamPrimitive(ofstream &out) const
 {
-    TString name = ToLower(fName);
-
-    out << "   " << ClassName() << " " << name << "(\"";
+    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";
     out << fChain->GetName() << "\", \"" << fName << "\", \"" << fTitle << "\");" << endl;
 
@@ -793 +791 @@
     TObject *obj = NULL;
     while ((obj=Next()))
-        out << "   " << name << ".AddFile(\"" << obj->GetTitle() << "\");" << endl;
+        out << "   " << GetUniqueName() << ".AddFile(\"" << obj->GetTitle() << "\");" << endl;
 
     if (!fAutoEnable)
-        out << "   " << name << ".DisableAutoScheme();" << endl;
+        out << "   " << GetUniqueName() << ".DisableAutoScheme();" << endl;
 
     if (fNumEntry!=0)
-       out << "   " << name << ".SetEventNum(" << fNumEntry << ");" << endl;
-
-
-}
+       out << "   " << GetUniqueName() << ".SetEventNum(" << fNumEntry << ");" << endl;
+
+
+}

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -405 +405 @@
 void MWriteRootFile::StreamPrimitive(ofstream &out) const
 {
-    out << "   MWriteRootFile " << ToLower(fName) << "(\"";
+    out << "   MWriteRootFile " << GetUniqueName() << "(\"";
     out << fOut->GetName() << "\", \"";
     out << fOut->GetOption() << "\", \"";
@@ -419 +419 @@
         {
             entry->GetContainer()->SavePrimitive(out);
-            out << "&" << ToLower(entry->GetContainer()->GetName());
+            out << "&" << entry->GetContainer()->GetUniqueName();
         }
         else

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -372 +372 @@
 void MF::StreamPrimitive(ofstream &out) const
 {
-    out << "   MF " << ToLower(fName) << "";
-}
-
+    out << "   MF " << GetUniqueName() << "";
+}
+

trunk/MagicSoft/Mars/mfilter/MFAlpha.cc

@@ -117 +117 @@
         fHillas->SavePrimitive(out);
 
-    out << "   MFParticleId " << ToLower(fName) << "(";
+    out << "   MFParticleId " << GetUniqueName() << "(";
 
     if (fHillas)
-        out << "&" << ToLower(fHillas->GetName());
+        out << "&" << fHillas->GetUniqueName();
     else
         out << "\"" << fContName << "\"";

trunk/MagicSoft/Mars/mfilter/MFDataMember.cc

@@ -103 +103 @@
 void MFDataMember::StreamPrimitive(ofstream &out) const
 {
-    out << "   MFDataMember " << ToLower(fName) << "(\"";
+    out << "   MFDataMember " << GetUniqueName() << "(\"";
     out << fData.GetRule() << "\", '";
     out << (fFilterType==kELowerThan?"<":">");

trunk/MagicSoft/Mars/mfilter/MFParticleId.cc

@@ -128 +128 @@
         fMcEvt->SavePrimitive(out);
 
-    out << "   MFParticleId " << ToLower(fName) << "(";
+    out << "   MFParticleId " << GetUniqueName() << "(";
 
     if (fMcEvt)
-        out << "&" << ToLower(fMcEvt->GetName());
+        out << "&" << fMcEvt->GetUniqueName();
     else
         out << "\"" << fContName << "\"";

trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc

@@ -123 +123 @@
         fMcTrig->SavePrimitive(out);
 
-    out << "   MFTriggerLvl1 " << ToLower(fName) << "(";
+    out << "   MFTriggerLvl1 " << GetUniqueName() << "(";
 
     if (fMcTrig)
-        out << "&" << ToLower(fMcTrig->GetName());
+        out << "&" << fMcTrig->GetUniqueName();
     else
         out << "\"" << fContName << "\"";

trunk/MagicSoft/Mars/mhist/MBinning.cc

@@ -36 +36 @@
 ClassImp(MBinning);
 
+static const TString gsDefName  = "MBinning";
+static const TString gsDefTitle = "Container describing the binning of an axis";
+
 // --------------------------------------------------------------------------
 //
@@ -46 +49 @@
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MBinning";
-    fTitle = title ? title : "Container describing the binning of an axis";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     SetEdges(10, 0, 1);
@@ -105 +108 @@
 void MBinning::StreamPrimitive(ofstream &out) const
 {
-    out << "   MBinning " << ToLower(fName) << "(\"";
-    out << fName << "\", \"" << fTitle << "\");" << endl;
+    out << "   MBinning " << GetUniqueName();
+    if (fName!=gsDefName)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+        out <<")";
+    }
+    out << ";" << endl;
 
     if (IsDefault())
@@ -113 +123 @@
     if (IsLinear() || IsLogarithmic())
     {
-        out << "   " << ToLower(fName) << ".SetEdges";
+        out << "   " << GetUniqueName() << ".SetEdges";
         if (IsLogarithmic())
             out << "Log";
@@ -124 +134 @@
     for (int i=0; i<GetNumEdges(); i++)
         out << "      dummy[" << i << "]=" << GetEdges()[i] << ";" << endl;
-    out << "      " << ToLower(fName) << ".SetEdges(dummy);" << endl;
+    out << "      " << GetUniqueName() << ".SetEdges(dummy);" << endl;
     out << "   }" << endl;
 }

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -358 +358 @@
         fParContainer->SavePrimitive(out);
 
-    out << "   MFillH " << ToLower(fName) << "(";
+    out << "   MFillH " << GetUniqueName() << "(";
 
     if (fH)
-        out << "&" << ToLower(fH->GetName());
+        out << "&" << fH->GetUniqueName();
     else
         out << "\"" << fHName << "\"";
 
     if (fParContainer)
-        out << ", &" << ToLower(fParContainer->GetName());
+        out << ", &" << fParContainer->GetUniqueName();
     else
         if (!fParContainerName.IsNull())

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -78 +78 @@
 ClassImp(MH3);
 
+static const TString gsDefName  = "MH3";
+static const TString gsDefTitle = "Container for a %dD Mars Histogram";
+
 MH3::MH3() : fDimension(0), fHist(NULL)
 {
-    fName  = "MH3";
-    fTitle = "Container for a 1D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 0);
 
     fData[0]  = fData[1]  = fData[2]  = NULL;
@@ -101 +104 @@
     fData[2] = NULL;
 
-    fName  = "MH3";
-    fTitle = "Container for a 1D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 1);
 
     fHist->SetDirectory(NULL);
@@ -127 +130 @@
     fData[2] = NULL;
 
-    fName  = "MH3";
-    fTitle = "Container for a 2D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 2);
 
     fHist->SetDirectory(NULL);
@@ -153 +156 @@
     fData[2] = new MDataChain(memberz);
 
-    fName  = "MH3";
-    fTitle = "Container for a 3D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 3);
 
     fHist->SetDirectory(NULL);
@@ -386 +389 @@
 void MH3::StreamPrimitive(ofstream &out) const
 {
-    TString name = ToLower(fName);
+    TString name = GetUniqueName();
 
     out << "   MH3 " << name << "(\"";
@@ -397 +400 @@
     out << ");" << endl;
 
-    out << "   " << name << ".SetName(\"" << fName << "\");" << endl;
-    out << "   " << name << ".SetTitle(\"" << fTitle << "\");" << endl;
+    if (fName!=gsDefName)
+        out << "   " << name << ".SetName(\"" << fName << "\");" << endl;
+
+    if (fTitle!=Form(gsDefTitle.Data(), fDimension))
+        out << "   " << name << ".SetTitle(\"" << fTitle << "\");" << endl;
 
     switch (fDimension)