Changeset 1493 for trunk/MagicSoft

Timestamp:

08/09/02 09:13:10 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mdata/MDataChain.cc (modified) (1 diff)
• mfilter/MF.cc (modified) (3 diffs)
• mfilter/MF.h (modified) (1 diff)
• mfilter/MFDataMember.cc (modified) (1 diff)
• mfilter/MFilterList.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/08/09: Thomas Bretz
+
+   * mbase/MIter.[h,cc]:
+     - added
+
+   * mbase/BaseLinkDef.h, mbase/Makefile:
+     - added MIter
+
+   * mdata/MDataChain.cc:
+     - added sanity check in StreamPrimitive
+
+   * mfilter/MF.[h,cc]:
+     - fixed StreamPrimitive
+     - don'w stream standard name and title.
+     - added default constructor
+
+   * mfilter/MFDataMeber.cc:
+     - strip spces from value before returning GetRule
+
+   * mfilter/MFilterList.[h,cc]:
+     - fixed StreamPrimitive
+     - don'w stream standard name and title.
+
+
 
  2002/08/08: Thomas Bretz
@@ -42 +67 @@
      - changed layout of plots
      - changed name and title of MakeDefCanvas
+     - made independant of MHillas
+     - exchanged the usage of the Fill-argument (MHillasExt) and the
+       stored pointer (MHillasSrc)
+     - changed the default binning of asym to be symmetric
 
    * mbase/MTask.cc:
@@ -51 +80 @@
    * macros/dohtml.C:
      - added starplot.C
+
+   * macros/MagicHillas.C, macros/CT1Hillas.C:
+     - changed to use new stylish Hillas Histograms
+
+   * macros/star.C:
+     - changed to interpolate pixels around hot spots
+     - write Sourcs and AntoSource to RunHeaders
 
 

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -490 +490 @@
 TString MDataChain::GetRule() const
 {
+    if (!fMember)
+        return "<n/a>";
+
     TString str;
 

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -87 +87 @@
 ClassImp(MF);
 
+static const TString gsDefName  = "MF";
+static const TString gsDefTitle = "Filter setup by a text-rule";
+
+// --------------------------------------------------------------------------
+//
+// Default Constructor. Don't use.
+//
+MF::MF() : fFilter(NULL)
+{
+    fName  = gsDefName.Data();
+    fTitle = gsDefTitle.Data();
+}
+
 // --------------------------------------------------------------------------
 //
@@ -94 +107 @@
 MF::MF(const char *text, const char *name, const char *title)
 {
-    fName  = name  ? name  : "MF";
-    fTitle = title ? title : "Filter using a text";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     *fLog << inf << "Trying to resolve filter rule..." << endl;
@@ -372 +385 @@
 void MF::StreamPrimitive(ofstream &out) const
 {
-    out << "   MF " << GetUniqueName() << "";
-}
-
+    out << "   MF " << GetUniqueName();
+
+    if (!fFilter)
+    {
+        out << ";" << endl;
+        return;
+    }
+
+    out << "(\"" << fFilter->GetRule() << "\"";
+        if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+    }
+    out << ");" << endl;
+
+}
+

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -27 +27 @@
 
 public:
+    MF();
     MF(const char *text, const char *name=NULL, const char *title=NULL);
     ~MF();

trunk/MagicSoft/Mars/mfilter/MFDataMember.cc

@@ -113 +113 @@
     TString ret = fData.GetRule();
     ret += fFilterType==kELowerThan?"<":">";
-    ret += fValue;
-    return ret;
+
+    TString str;
+    str += fValue;
+
+    return ret+str.Strip(TString::kBoth);
 }
 

trunk/MagicSoft/Mars/mfilter/MFilterList.cc

@@ -28 +28 @@
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MFilterList.h"
 
@@ -38 +37 @@
 #include "MLogManip.h"
 
+#include "MIter.h"
+
 ClassImp(MFilterList);
+
+static const TString gsDefName  = "MFilterList";
+static const TString gsDefTitle = "List combining filters logically.";
 
 // --------------------------------------------------------------------------
@@ -57 +61 @@
 MFilterList::MFilterList(const char *type, const char *name, const char *title)
 {
-    fName  = name  ? name  : "MFilterList";
-    fTitle = title ? title : "List combining filters logically.";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     fFilterType = kEAnd;
@@ -277 +281 @@
     }
 
-    out << fName << "\", \"" << fName << "\", \"" << fTitle << "\");" << endl << endl;
-
-    TIter Next(&fFilters);
-
-    TObject *cont = NULL;
+    out << "\"";
+
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << ", \"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+    }
+    out << ");" << endl << endl;
+
+    MIter Next(&fFilters);
+
+    MParContainer *cont = NULL;
     while ((cont=Next()))
     {
@@ -287 +299 @@
 
         out << "   " << ToLower(fName) << ".AddToList(&";
-        out << ToLower(cont->GetName()) << ");" << endl << endl;
+        out << cont->GetUniqueName() << ");" << endl << endl;
     }
 }