Changeset 1408 for trunk/MagicSoft

Timestamp:

07/16/02 11:00:32 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• NEWS (modified) (1 diff)
• macros/MagicHillas.C (modified) (3 diffs)
• mfileio/MWriteAsciiFile.cc (modified) (5 diffs)
• mfileio/MWriteAsciiFile.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/07/16: Thomas Bretz
+
+   * mgui/MHexagon.cc:
+     - added a sanity check in DistanceToPrimitive
+
+   * mgui/MCamDisplay.[h,cc]:
+     - added DistanceToPrimitive
+     - declared virtual functions as virtual (easier to read in the Dox)
+
+   * mfileio/MWriteAsciiFile.[h,cc]:
+     - renamed AddContainer and AddRule to AddColumn and AddColumns
+
+   * macros/MagicHillas.C:
+     - adopted to new names of MWriteAsciiFile member functions
+
+
 
  2002/07/15: Abelardo Moralejo
@@ -5 +22 @@
    * manalysis/MCerPhotCalc2.[h,cc]
      - converted fWeight into a static variable.
+
+
 
  2002/07/11: Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -38 +38 @@
      CT1 camera (a pixel 127 doesn't exist and the pixel 126 didn't
      have any neighbour)
+
+   - Calls to MWriteAsciiFile::AddContainer and MWriteAsciiFile::AddRule
+     must be replaced by calles to MWriteAsciiFile::AddColumn and
+     MWriteAsciiFile::AddColumns. Be carefull, the arguments have slightly
+     changed.
 
 

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -113 +113 @@
     MFillH hfill2a("HistAntiSrc [MHHillasSrc]", "HillasAntiSrc");
 
-    MWriteRootFile write("hillas.root");
-    write.AddContainer("MHillas",       "Hillas");
-    write.AddContainer("HillasSource",  "Hillas");
-    write.AddContainer("HillasAntiSrc", "Hillas");
-    write.AddContainer("MHStarMap");
-    write.AddContainer("MMcEvt","Hillas");
+    /*
+     MWriteRootFile write("hillas.root");
+     write.AddContainer("MHillas",       "Hillas");
+     write.AddContainer("HillasSource",  "Hillas");
+     write.AddContainer("HillasAntiSrc", "Hillas");
+     write.AddContainer("MMcEvt",        "Hillas");
+     write.AddContainer("MHStarMap");
 
-
-    /*
      MWriteAsciiFile write("hillas.txt");
-     write.AddContainer("MHillas", "fLength");
-     write.AddContainer("MHillas", "fConc");
-     write.AddContainer("MHillas");
+     write.AddColumn("MHillas.fLength*MGeomCam.fConvMm2Deg");
+     write.AddColumn("MHillas", "fConc");
+     write.AddColumns("MHillas");
      */
 
@@ -141 +140 @@
     tlist.AddToList(&hfill2s);
     tlist.AddToList(&hfill2a);
-    tlist.AddToList(&write);
 
     //
@@ -159 +157 @@
     //
     // After the analysis is finished we can display the histograms
-    //
+
     plist.FindObject("MHHillas")->DrawClone();
     plist.FindObject("HistSource")->DrawClone();

trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc

@@ -95 +95 @@
 
     if (contname)
-       AddContainer(contname);
+       AddColumns(contname);
 }
 
@@ -115 +115 @@
 
     if (cont)
-        AddContainer(cont);
+        AddColumns(cont);
 }
 
@@ -140 +140 @@
 // --------------------------------------------------------------------------
 //
+// Tries to get all containers from the ParList which were given by name
+// adds them to the list of pointers to the container which should be
+// written to the ascii file.
+//
+Bool_t MWriteAsciiFile::GetContainer(MParList *plist)
+{
+    TObject *obj=NULL;
+
+    TIter Next(&fList);
+    while ((obj=Next()))
+    {
+        //
+        // MData is the highest class in the inheritance tree
+        //
+        if (obj->InheritsFrom(MData::Class()))
+        {
+            if (!((MData*)obj)->PreProcess(plist))
+                return kFALSE;
+            continue;
+        }
+
+        //
+        // MParContainer is the next class in the inheritance tree
+        //
+        if (obj->InheritsFrom(MParContainer::Class()))
+            continue;
+
+        //
+        // It is neither a MData nor a MParContainer, it must be a TNamed
+        //
+        TObject *o = plist->FindObject(obj->GetName());
+        if (!o)
+            return kFALSE;
+
+        fList[fList.IndexOf(obj)] = o;
+    }
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Check if the containers are ready for writing. If so write them.
+// The containers are written in one line, one after each other.
+// If not all containers are written (because of the IsReadyToSave-flag)
+// a warning message is print.
+//
+void MWriteAsciiFile::CheckAndWrite() const
+{
+    Bool_t written = kFALSE;
+
+    MParContainer *obj = NULL;
+
+    Int_t num = fList.GetEntries();
+
+    TIter Next(&fList);
+    while ((obj=(MParContainer*)Next()))
+    {
+        if (!obj->IsReadyToSave())
+            continue;
+
+        if (!obj->AsciiWrite(*fOut))
+            continue;
+
+        written = kTRUE;
+
+        num--;
+    }
+
+    if (!written)
+        return;
+
+    *fOut << endl;
+
+    if (num!=0)
+        *fLog << warn << "Warning - given number of objects doesn't fit number of written objects." << endl;
+}
+
+// --------------------------------------------------------------------------
+//
 // Add a rule to be written as a column to the ascii file.
 // For more information about rules see MDataChain.
 //
-void MWriteAsciiFile::AddRule(const char *rule)
+//  eg: MWriteAsciiFile::AddColumn("log10(MHillas.fEnergy)/2")
+//
+void MWriteAsciiFile::AddColumn(const TString rule)
 {
     MDataChain *chain = new MDataChain(rule);
@@ -151 +232 @@
 // --------------------------------------------------------------------------
 //
-// Add another container (by pointer) to be written to the ascii file.
-// The container will be output one after each other in one line.
-// 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 (strip the f and
-// replace it by Get)
-// 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 TString member, Double_t scale)
-{
-    if (member.IsNull())
-    {
-        fList.Add(cont);
-        return;
-    }
-
+// Add another column to be written to the ascii file. The columns will be
+// output one after each other in one line.
+// Specify the name of the data member to be written (eg fWidth) and
+// a possible scale factor (eg. to transform millimeters to degrees)
+//
+//  eg:
+//       MMcEvt evt;
+//       MWriteAsciiFile::AddColumn(&evt, "fImpact", 0.01);
+//
+void MWriteAsciiFile::AddColumn(MParContainer *cont, const TString member, Double_t scale)
+{
     MData *data = new MDataMember(cont, member);
 
@@ -193 +264 @@
 // Add another container (by name) to be written to the ascii file.
 // The container will be output one after each other in one line.
-// 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 (strip the f and
-// replace it by Get)
-// 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 TString cont, const TString member, Double_t scale)
-{
-    if (member.IsNull())
-    {
-        TNamed *name = new TNamed(cont, cont);
-        fList.Add(name);
-        fAutoDel.Add(name);
-        return;
-    }
-
-    MData *data = new MDataMember(Form("%s.%s", (const char*)cont, (const char*)member));
-    if (scale!=1)
-    {
-        MDataList  *list = new MDataList('*');
-        MDataValue *val  = new MDataValue(scale);
-
-        list->SetOwner();
-        list->AddToList(data);
-        list->AddToList(val);
-
-        data = list;
-    }
-    fList.Add(data);
-    fAutoDel.Add(data);
-}
-
-// --------------------------------------------------------------------------
-//
-// Tries to get all containers from the ParList which were given by name
-// adds them to the list of pointers to the container which should be
-// written to the ascii file.
-//
-Bool_t MWriteAsciiFile::GetContainer(MParList *plist)
-{
-    TObject *obj=NULL;
-
-    TIter Next(&fList);
-    while ((obj=Next()))
-    {
-        //
-        // MData is the highest class in the inheritance tree
-        //
-        if (obj->InheritsFrom(MData::Class()))
-        {
-            if (!((MData*)obj)->PreProcess(plist))
-                return kFALSE;
-            continue;
-        }
-
-        //
-        // MParContainer is the next class in the inheritance tree
-        //
-        if (obj->InheritsFrom(MParContainer::Class()))
-            continue;
-
-        //
-        // It is neither a MData nor a MParContainer, it must be a TNamed
-        //
-        TObject *o = plist->FindObject(obj->GetName());
-        if (!o)
-            return kFALSE;
-
-        fList[fList.IndexOf(obj)] = o;
-    }
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Check if the containers are ready for writing. If so write them.
-// The containers are written in one line, one after each other.
-// If not all containers are written (because of the IsReadyToSave-flag)
-// a warning message is print.
-//
-void MWriteAsciiFile::CheckAndWrite() const
-{
-    Bool_t written = kFALSE;
-
-    MParContainer *obj = NULL;
-
-    Int_t num = fList.GetEntries();
-
-    TIter Next(&fList);
-    while ((obj=(MParContainer*)Next()))
-    {
-        if (!obj->IsReadyToSave())
-            continue;
-
-        if (!obj->AsciiWrite(*fOut))
-            continue;
-
-        written = kTRUE;
-
-        num--;
-    }
-
-    if (!written)
-        return;
-
-    *fOut << endl;
-
-    if (num!=0)
-        *fLog << warn << "Warning - given number of objects doesn't fit number of written objects." << endl;
-}
-
+// The output will be done either by MParContainer::AsciiWrite or
+// by the corresponding overloaded function.
+//
+//  eg: MWriteAsciiFile::AddColumns("MMcEvt")
+//
+void MWriteAsciiFile::AddColumns(const TString cont)
+{
+    TNamed *name = new TNamed(cont, cont);
+    fList.Add(name);
+    fAutoDel.Add(name);
+}
+
+// --------------------------------------------------------------------------
+//
+// Add another container (by pointer) to be written to the ascii file.
+// The container will be output one after each other in one line.
+// The output will be done either by MParContainer::AsciiWrite or
+// by the corresponding overloaded function.
+//
+//  eg:
+//      MMcEvt evt;
+//      MWriteAsciiFile::AddColumns(&evt);
+//
+void MWriteAsciiFile::AddColumns(MParContainer *cont)
+{
+    fList.Add(cont);
+}

trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.h

@@ -35 +35 @@
     ~MWriteAsciiFile();
 
-    void AddContainer(const TString cname, const TString member="", Double_t scale=1);
-    void AddContainer(MParContainer *cont, const TString member="", Double_t scale=1);
-
-    void AddRule(const char *rule);
+    void AddColumn(const TString rule);
+    void AddColumn(MParContainer *cont, const TString member="", Double_t scale=1);
+    void AddColumns(const TString name);
+    void AddColumns(MParContainer *cont);
 
     ClassDef(MWriteAsciiFile, 0) // Class to write one container to an ascii file