Changeset 1235

Timestamp:

03/07/02 15:28:30 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• mbase/MParContainer.cc (modified) (4 diffs)
• mbase/MParContainer.h (modified) (1 diff)
• mbase/MWriteAsciiFile.cc (modified) (6 diffs)
• mbase/MWriteAsciiFile.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/03/07: Thomas Bretz
+
+   * mbase/MParContainer.[h,cc], MWriteAsciiFile.[h,cc]:
+     - added a scale value which can be used in case you are writing
+       single data mambers
+
+
 
  2002/03/04: Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -5 +5 @@
    - Ascii Output can now also be used for parameter containers which
      doesn't overload MParCointainer::AsciiWrite
+
+   - The Ascii Output is now also capable of writing single data members
+     of one container
+
+   - You are now able to change the order of the values written to the
+     ascii file
+
+   - You can now specify a conversion factor for each data member written
+     to an ascii file. This may be usefull to change the units of the 
+     data member (eg. degrees instead of millimeters in case of the 
+     hillas parameters)
 
    - replaced old MHillas by a new structure which allows you to extend
@@ -23 +34 @@
    - it is now possible to write single data members of a class object to
      an output stream instead of the whole container only
- 
- 
+
+
+
  *** Version 0.6 (2001/01/15)
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -217 +217 @@
 //  Write out a data member given as a TDataMember object to an output stream.
 //
-Bool_t MParContainer::WriteDataMember(ostream &out, const TDataMember *member) const
+Bool_t MParContainer::WriteDataMember(ostream &out, const TDataMember *member, Double_t scale) const
 {
     if (!member)
@@ -245 +245 @@
         Double_t d;
         call->Execute((void*)this, d); // FIXME: const, root
-        out << d << " ";
+        out << (scale*d) << " ";
         return kTRUE;
 
@@ -260 +260 @@
 //  Write out a data member given by name to an output stream.
 //
-Bool_t MParContainer::WriteDataMember(ostream &out, const char *member) const
+Bool_t MParContainer::WriteDataMember(ostream &out, const char *member, Double_t scale) const
 {
     /*const*/ TClass *cls = IsA()->GetBaseDataMember(member);
@@ -266 +266 @@
         return kFALSE;
 
-    return WriteDataMember(out, cls->GetDataMember(member));
+    return WriteDataMember(out, cls->GetDataMember(member), scale);
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -66 +66 @@
     virtual void   SetReadyToSave(Bool_t flag=kTRUE) { fReadyToSave=flag; }
 
-    Bool_t WriteDataMember(ostream &out, const char *member) const;
-    Bool_t WriteDataMember(ostream &out, const TDataMember *member) const;
+    Bool_t WriteDataMember(ostream &out, const char *member, Double_t scale=1) const;
+    Bool_t WriteDataMember(ostream &out, const TDataMember *member, Double_t scale=1) const;
     Bool_t WriteDataMember(ostream &out, const TList *list) const;
 

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -148 +148 @@
     while ((cont=(MParContainer*)NextCont()))
     {
-        const TObject *memb = NextMemb();
+        const MScale *memb = (MScale*)NextMemb();
 
         if (!cont->IsReadyToSave())
@@ -160 +160 @@
         else
         {
-            if (!cont->WriteDataMember(*fOut, memb->GetName()))
+            if (!cont->WriteDataMember(*fOut, memb->GetName(), memb->GetScale()))
                 continue;
         }
@@ -196 +196 @@
 Bool_t MWriteAsciiFile::GetContainer(MParList *pList)
 {
-    TObject *obj = NULL;
+    MScale *obj = NULL;
 
     TIter Next(&fContNames);
 
-    while ((obj=Next()))
+    while ((obj=(MScale*)Next()))
     {
         const char *name = obj->GetName();
@@ -211 +211 @@
         }
 
-        AddContainer(cont, obj->GetTitle());
+        AddContainer(cont, obj->GetTitle(), obj->GetScale());
     }
 
@@ -223 +223 @@
 // If you want to write only one data member of the container
 // specify the name of the data member (eg. fAlpha) Make sure,
-// that a "GetteMethod" for this data type exists (strif the f and
+// that a "GetteMethod" for this data type exists (strip the f and
 // replace it by Get)
-//
-void MWriteAsciiFile::AddContainer(const char *cname, const char *member)
-{
-    TNamed *named = new TNamed(cname, member);
-    fContNames.AddLast(named);
+// If you specify a single data member you can add a scale-factor which
+// is (in case of the data member being a floating point value) multiplied
+// with the data member value. This is usefull if you are want to
+// change the scale (unit) of a data member for writing (eg.
+// writing degrees for the hillas parameters instead of the internally
+// used millimeters)
+//
+void MWriteAsciiFile::AddContainer(const char *cname, const char *member, Double_t scale)
+{
+    MScale *name = new MScale(cname, member, scale);
+    fContNames.AddLast(name);
 }
 
@@ -238 +244 @@
 // If you want to write only one data member of the container
 // specify the name of the data member (eg. fAlpha) Make sure,
-// that a "GetteMethod" for this data type exists (strif the f and
+// that a "GetteMethod" for this data type exists (strip the f and
 // replace it by Get)
-//
-void MWriteAsciiFile::AddContainer(MParContainer *cont, const char *member)
+// If you specify a single data member you can add a scale-factor which
+// is (in case of the data member being a floating point value) multiplied
+// with the data member value. This is usefull if you are want to
+// change the scale (unit) of a data member for writing (eg.
+// writing degrees for the hillas parameters instead of the internally
+// used millimeters)
+//
+void MWriteAsciiFile::AddContainer(MParContainer *cont, const char *member, Double_t scale)
 {
     fContainer.AddLast(cont);
 
-    TNamed *named = new TNamed(member, "");
-    fMembers.AddLast(named);
-}
-
+    MScale *name = new MScale(member, "", scale);
+    fMembers.AddLast(name);
+}
+

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.h

@@ -12 +12 @@
 {
 private:
+    class MScale : public TNamed
+    {
+    private:
+        Double_t fScale;
+    public:
+        MScale(const char *name, const char *title, Double_t scale)
+            : TNamed(name, title), fScale(scale) {}
+        Double_t GetScale() const { return fScale; }
+    };
+
     ofstream *fOut;
 
@@ -17 +27 @@
     TObjArray fContainer;
     TObjArray fMembers;
+    TObjArray fScale;
 
     TString fNameFile;
@@ -34 +45 @@
     ~MWriteAsciiFile();
 
-    void AddContainer(const char *cname, const char *member="");
-    void AddContainer(MParContainer *cont, const char *member="");
+    void AddContainer(const char *cname, const char *member="", Double_t scale=1);
+    void AddContainer(MParContainer *cont, const char *member="", Double_t scale=1);
 
     ClassDef(MWriteAsciiFile, 0) // Class to write one container to an ascii file