Changeset 1471 for trunk/MagicSoft/Mars

Timestamp:

08/01/02 12:31:56 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MHillasSrcCalc.cc (modified) (2 diffs)
• manalysis/MHillasSrcCalc.h (modified) (1 diff)
• manalysis/MImgCleanStd.cc (modified) (2 diffs)
• manalysis/MImgCleanStd.h (modified) (1 diff)
• manalysis/MSrcPosCam.cc (modified) (1 diff)
• manalysis/MSrcPosCam.h (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• mbase/MEvtLoop.h (modified) (1 diff)
• mbase/MParContainer.cc (modified) (1 diff)
• mbase/MParContainer.h (modified) (1 diff)
• mbase/MParList.cc (modified) (2 diffs)
• mbase/MParList.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (2 diffs)
• mbase/MTaskList.h (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (1 diff)
• mfileio/MReadTree.h (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.h (modified) (1 diff)
• mhist/MFillH.cc (modified) (2 diffs)
• mhist/MFillH.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -2 +2 @@
 
  2002/08/01: Thomas Bretz
+
+   * manalysis/MHillasSrcCalc.[h,cc], manalysis/MImgCleanStd.[h,cc],
+     manalysis/MSrcPosCam.[h,cc], mbase/MEvtLoop.[h,cc], 
+     mbase/MParContainer.[h,cc], mbase/MParList.[h,cc],
+     mbase/MTaskList.[h,cc], mfileio/MReadTree.[h,cc],
+     mfileio/MWriteRootFile.[h,cc], mhist/MFillH.[h,cc]:
+     - added SavePrimitive
 
    * manalysis/MHillas.[h,cc]:

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

@@ -32 +32 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "MHillasSrcCalc.h"
+
+#include <fstream.h>
 
 #include "MParList.h"
@@ -94 +96 @@
 }
 
+
+void MHillasSrcCalc::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MHillasSrcCalc " << ToLower(fName) << "(\"";
+    out << fSrcName << "\", \"" << fHillasName << "\", \"";
+    out << fName << "\", \"" << fTitle << "\");" << endl;
+}

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h

@@ -27 +27 @@
     Bool_t Process();
 
+    void SavePrimitive(ofstream &out, Option_t *o="");
+
     ClassDef(MHillasSrcCalc, 0) // task to calculate the source position depandant hillas parameters
 };

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -44 +44 @@
 
 #include <stdlib.h>       // atof
+#include <fstream.h>      // ofstream, SavePrimitive
 
 #include <TGFrame.h>      // TGFrame
@@ -406 +407 @@
     return kTRUE;
 }
+
+void MImgCleanStd::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MImgCleanStd " << ToLower(fName) << "(";
+    out << fCleanLvl1 << ", " << fCleanLvl2 << ", \"";
+    out << fName << "\", \"" << fTitle << "\");" << endl;
+}

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h

@@ -34 +34 @@
 
     void Print(Option_t *o="") const;
+    void SavePrimitive(ofstream &out, Option_t *o="");
 
     Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);

trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc

@@ -81 +81 @@
 }
 */
+
+void MSrcPosCam::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MSrcPosCam " << ToLower(fName) << "(\"";
+    out << fName << "\", " << fTitle << "\");" << endl;
+
+    out << "   " << ToLower(fName) << ".SetXY(" << fX << ", " << fY << ");" << endl;}

trunk/MagicSoft/Mars/manalysis/MSrcPosCam.h

@@ -29 +29 @@
     //void AsciiWrite(ofstream &fout) const;
 
+    void SavePrimitive(ofstream &out, Option_t *o="");
+
     ClassDef(MSrcPosCam, 1) // container to store source position in the camera plain
 };

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -54 +54 @@
 #include "MEvtLoop.h"
 
+#include <fstream.h>     // ofstream, SavePrimitive
 #include <iostream.h>
 
@@ -274 +275 @@
 }
 
+void MEvtLoop::SavePrimitive(ofstream &out, Option_t *)
+{
+    fParList->SavePrimitive(out);
+
+    out << "   MEvtLoop evtloop;" << endl;
+    out << "   evtloop.SetParList(&" << ToLower(fParList->GetName()) << ")" << endl;
+    out << "   if (!evtloop.Eventloop())" << endl;
+    out << "      return;" << endl;
+}

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -46 +46 @@
     Bool_t Eventloop(Int_t maxcnt=-1, const char *tlist="MTaskList");
 
+    void SavePrimitive(ofstream &out, Option_t *o="");
+
     ClassDef(MEvtLoop, 0) // Class to execute the tasks in a tasklist
 };

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -346 +346 @@
     return call;
 }
+
+void MParContainer::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   // SavePrimitive not overloaded... using default." << endl;
+    out << "   " << ClassName() << " " << ToLower(fName) << "(\"";
+    out << fName << "\", \"" << fTitle << "\");" << endl;
+}
+

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -61 +61 @@
     virtual void        Print(Option_t *option="") const;
     virtual Int_t       Sizeof() const;
+    virtual void        SavePrimitive(ofstream &out, Option_t *o="");
 
     virtual void   SetLogStream(MLog *lg) { fLog = lg; }

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -41 +41 @@
 #include "MParList.h"
 
+#include <fstream.h>     // ofstream, SavePrimitive
+
 #include <TNamed.h>
 #include <TClass.h>
@@ -657 +659 @@
     return list;
 }
+
+void MParList::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MParList " << ToLower(fName) << ";" << endl << endl;
+
+    TIter Next(fContainer);
+
+    TObject *cont = NULL;
+    while ((cont=Next()))
+    {
+        cont->SavePrimitive(out, "");
+        out << "   " << ToLower(fName) << ".AddToList(&";
+        out << ToLower(cont->GetName()) << ");" << endl << endl;
+    }
+}

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -78 +78 @@
 
     void Print(Option_t *t = NULL) const;
+    void SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MParList, 0) // list of parameter containers (MParContainer)

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -57 +57 @@
 #include "MTaskList.h"
 
+#include <fstream.h>     // ofstream, SavePrimitive
+
 #include <TClass.h>
 #include <TBaseClass.h>
@@ -512 +514 @@
 }
 
+
+void MTaskList::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MTaskList " << ToLower(fName) << ";" << endl << endl;
+
+    TIter Next(fTasks);
+
+    TObject *cont = NULL;
+    while ((cont=Next()))
+    {
+        cont->SavePrimitive(out, "");
+        out << "   " << ToLower(fName) << ".AddToList(&";
+        out << ToLower(cont->GetName()) << ");" << endl << endl;
+    }
+}

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -56 +56 @@
     void SetOwner(Bool_t enable=kTRUE);
 
+    void SavePrimitive(ofstream &out, Option_t *o="");
+
     const TList *GetList() const { return fTasks; }
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -801 +801 @@
     *fLog << " Next Entry to read: " << fNumEntry << endl;
 }
+
+void MReadTree::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    TString name = ToLower(fName);
+
+    out << "   " << ClassName() << " " << name << "(";
+    out << fChain->GetName() << ", \"" << fName << "\", \"" << fTitle << "\");" << endl;
+
+    TIter Next(fChain->GetListOfFiles());
+    TObject *obj = NULL;
+    while ((obj=Next()))
+        out << "   " << name << ".AddFile(\"" << obj->GetTitle() << "\");" << endl;
+
+    if (!fAutoEnable)
+        out << "   " << name << ".DisableAutoScheme();" << endl;
+
+    if (fNumEntry!=0)
+       out << "   " << name << ".SetEventNum(" << fNumEntry << ");" << endl;
+
+
+}

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -71 +71 @@
 
     virtual Bool_t Notify();
+    virtual void   SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MReadTree, 0)      // Reads a tree from file(s)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -34 +34 @@
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MWriteRootFile.h"
+
+#include <fstream.h>
 
 #include <TFile.h>
@@ -383 +384 @@
 }
 
+void MWriteRootFile::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MWriteRootFile " << ToLower(fName) << "(\"";
+    out << fOut->GetName() << "\", \"";
+    out << fOut->GetOption() << "\", \"";
+    out << fOut->GetTitle() << "\", ";
+    out << fOut->GetCompressionLevel() << ", \"";
+    out << fName << "\", " << fTitle << "\");" << endl;;
+
+    MRootFileBranch *entry;
+    TIter Next(&fBranches);
+    while ((entry=(MRootFileBranch*)Next()))
+    {
+        out << "   " << ToLower(fName) << ".AddContainer(\"";
+        out << entry->GetContName() << "\", \"";
+        out << entry->GetName() << "\", \"";
+        out << entry->GetTitle() << "\")" << endl;
+    }
+}

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -85 +85 @@
 
     void Print(Option_t *t=NULL) const;
+    void SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MWriteRootFile, 0) // Class to write one container to a root file

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -69 +69 @@
 #include "MFillH.h"
 
+#include <fstream.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -331 +333 @@
     return kTRUE;
 }
+
+void MFillH::SavePrimitive(ofstream &out, Option_t *o="")
+{
+    out << "   MFillH " << ToLower(fName) << "(\"";
+    out << fHName << "\", \"" << fParContainerName << "\")" << endl;
+}

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -33 +33 @@
     Bool_t PostProcess();
 
+    void SavePrimitive(ofstream &out, Option_t *o="");
+
     ClassDef(MFillH, 0) // Task to fill a histogram with data from a parameter container
 };