Changeset 1477 for trunk/MagicSoft


Ignore:
Timestamp:
08/02/02 15:20:53 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1474 r1477  
    3030   * mhist/MH3.[h,cc]:
    3131     - implemented default constructor
     32
     33   * manalysis/MHillasSrcCalc.[h,cc], manalysis/MImgCleanStd.[h,cc],
     34     manalysis/MSrcPosCam.[h,cc], mbase/MParList.[h,cc], mbase/MTask.h,
     35     mbase/MTaskList.[h,cc], mfileio/MReadTree.[h,cc],
     36     mfileio/MWriteRootFile.[h,cc], mhist/MBinning.[h,cc],
     37     mhist/MFillH.[h,cc], mhist/MH3.[h,cc]:
     38     - renamed SavePrimitive to StreamPrimitive
     39     - implemented more accurate streaming
     40     - removed some "//!" from the data members
     41
     42   * mbase/MParContainer.[h,cc]:
     43     - new virtual function StreamPrimitive
     44     - implemented flag whether this container has been streamed already
     45
     46   * mbase/MTask.[h,cc]:
     47     - corrected streaming of primitive to stream filters correctly
     48     - increased version number to 1
     49
     50   * mhist/MBinning.[h,cc]:
     51     - move SetEdges and SetEdgesLog to the source file
     52     - implemented a flag telling something about the type of the binning
    3253
    3354

  • trunk/MagicSoft/Mars/NEWS

    r1472 r1477  
    6565     instead of removing it completely from the analysis
    6666
    67    - started a first implementation to be able to write the eventloop/
    68      eventloop setup to a file (root-file, root-macro)
     67   - Implemented the possibility to save the whole eventloop with
     68     its setup to a file. This information can be read and from
     69     it you can (re)create a Macro. See MEvtLoop::Read, MEvtLoop::Write
     70     and MEvtLoop::MakeMacro. If you find something not working, please
     71     report - this stuff is still in a beta phase.
    6972
    7073

  • trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

    r1476 r1477  
    3737#include "MParList.h"
    3838
     39#include "MSrcPosCam.h"
    3940#include "MHillasSrc.h"
    4041
    … …  
    103104// gui elements to a macro-file.
    104105//
    105 void MHillasSrcCalc::SavePrimitive(ofstream &out, Option_t *o)
     106void MHillasSrcCalc::StreamPrimitive(ofstream &out) const
    106107{
    107     out << "   MHillasSrcCalc " << ToLower(fName) << "(\"";
    108     out << fSrcName << "\", \"" << fHillasName << "\", \"";
    109     out << fName << "\", \"" << fTitle << "\");" << endl;
     108    if (fHillas)
     109        fHillas->SavePrimitive(out);
     110
     111    if (fSrcPos)
     112        fSrcPos->SavePrimitive(out);
     113
     114    if (fHillasSrc)
     115        fHillasSrc->SavePrimitive(out);
     116
     117    out << "   MHillasSrcCalc " << ToLower(fName) << "(";
     118
     119    if (fSrcPos)
     120        out << "&" << ToLower(fSrcPos->GetName());
     121    else
     122        out << "\"" << fSrcName << "\"";
     123
     124    if (fHillasSrc)
     125        out << "&" << ToLower(fHillasSrc->GetName());
     126    else
     127        out << "\"" << fHillasName << "\"";
     128
     129    out << ", \"" << fName << "\", \"" << fTitle << "\");" << endl;
    110130}

  • trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h

    r1474 r1477  
    1313{
    1414private:
    15     MHillas    *fHillas;     //! Pointer to the source independant hillas parameters
    16     MSrcPosCam *fSrcPos;     //! Pointer to the source position
    17     MHillasSrc *fHillasSrc;  //! Pointer to the output container for the source dependant parameters
     15    MHillas    *fHillas;     // Pointer to the source independant hillas parameters
     16    MSrcPosCam *fSrcPos;     // Pointer to the source position
     17    MHillasSrc *fHillasSrc;  // Pointer to the output container for the source dependant parameters
    1818
    1919    TString     fSrcName;
    2020    TString     fHillasName;
     21
     22    void StreamPrimitive(ofstream &out) const;
    2123
    2224public:
    … …  
    2729    Bool_t Process();
    2830
    29     void SavePrimitive(ofstream &out, Option_t *o="");
    30 
    3131    ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters
    3232};

  • trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

    r1476 r1477  
    414414// gui elements to a macro-file.
    415415//
    416 void MImgCleanStd::SavePrimitive(ofstream &out, Option_t *o)
     416void MImgCleanStd::StreamPrimitive(ofstream &out) const
    417417{
    418418    out << "   MImgCleanStd " << ToLower(fName) << "(";

  • trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h

    r1471 r1477  
    2121
    2222    void CreateGuiElements(MGGroupFrame *f);
     23    void StreamPrimitive(ofstream &out) const;
    2324
    2425public:
    … …  
    3435
    3536    void Print(Option_t *o="") const;
    36     void SavePrimitive(ofstream &out, Option_t *o="");
    3737
    3838    Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);

  • trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc

    r1476 r1477  
    8888// gui elements to a macro-file.
    8989//
    90 void MSrcPosCam::SavePrimitive(ofstream &out, Option_t *o)
     90void MSrcPosCam::StreamPrimitive(ofstream &out) const
    9191{
    9292    out << "   MSrcPosCam " << ToLower(fName) << "(\"";

  • trunk/MagicSoft/Mars/manalysis/MSrcPosCam.h

    r1471 r1477  
    1111    Float_t fX; // [mm] x position of source in camera
    1212    Float_t fY; // [mm] y position of source in camera
     13
     14    void StreamPrimitive(ofstream &out) const;
    1315
    1416public:
    … …  
    2931    //void AsciiWrite(ofstream &fout) const;
    3032
    31     void SavePrimitive(ofstream &out, Option_t *o="");
    32 
    3333    ClassDef(MSrcPosCam, 1) // container to store source position in the camera plain
    3434};

  • trunk/MagicSoft/Mars/mbase/MParContainer.cc

    r1476 r1477  
    8080    fTitle = rhs.fTitle;
    8181
    82     fLog         = rhs.fLog;
     82    fLog = rhs.fLog;
    8383    fReadyToSave = rhs.fReadyToSave;
    8484
    … …  
    123123    cont.fTitle = fTitle;
    124124
    125     cont.fLog         = fLog;
     125    cont.fLog = fLog;
    126126    cont.fReadyToSave = fReadyToSave;
    127127}
    … …  
    168168{
    169169    fName = name;
     170    ResetBit(kIsSavedAsPrimitive);
    170171    if (gPad && TestBit(kMustCleanup)) gPad->Modified();
    171172}
    … …  
    180181    fName  = name;
    181182    fTitle = title;
     183    ResetBit(kIsSavedAsPrimitive);
    182184    if (gPad && TestBit(kMustCleanup)) gPad->Modified();
    183185}
    … …  
    190192{
    191193    fTitle = title;
     194    ResetBit(kIsSavedAsPrimitive);
    192195    if (gPad && TestBit(kMustCleanup)) gPad->Modified();
    193196}
    … …  
    356359void MParContainer::SavePrimitive(ofstream &out, Option_t *o)
    357360{
    358     out << "   // SavePrimitive not overloaded... using default." << endl;
     361    if (IsSavedAsPrimitive())
     362        return;
     363
     364    StreamPrimitive(out);
     365    SetBit(kIsSavedAsPrimitive);
     366}
     367
     368// --------------------------------------------------------------------------
     369//
     370// Creates the string written by SavePrimitive and returns it.
     371//
     372void MParContainer::StreamPrimitive(ofstream &out) const
     373{
     374    out << "   // Using MParContainer::StreamPrimitive" << endl;
    359375    out << "   " << ClassName() << " " << ToLower(fName) << "(\"";
    360376    out << fName << "\", \"" << fTitle << "\");" << endl;

  • trunk/MagicSoft/Mars/mbase/MParContainer.h

    r1474 r1477  
    3434    MLog   *fLog;         // The general log facility for this object, initialized with the global object
    3535
     36    virtual void StreamPrimitive(ofstream &out) const;
     37
    3638private:
    3739    Bool_t  fReadyToSave; // should be set to true if the contents of the container is changed somehow
     40
     41    enum {
     42        kIsSavedAsPrimitive = BIT(15)
     43    };
    3844
    3945public:
    … …  
    6773    virtual Bool_t IsReadyToSave() const             { return fReadyToSave; }
    6874    virtual void   SetReadyToSave(Bool_t flag=kTRUE) { fReadyToSave=flag; }
     75    virtual Bool_t IsSavedAsPrimitive() const        { return TestBit(kIsSavedAsPrimitive); }
    6976
    7077    TMethodCall *GetterMethod(const char *name) const;

  • trunk/MagicSoft/Mars/mbase/MParList.cc

    r1476 r1477  
    666666// gui elements to a macro-file.
    667667//
    668 void MParList::SavePrimitive(ofstream &out, Option_t *o)
     668void MParList::StreamPrimitive(ofstream &out) const
    669669{
    670670    out << "   MParList " << ToLower(fName) << "(\"";
    … …  
    677677    {
    678678        cont->SavePrimitive(out, "");
     679
    679680        out << "   " << ToLower(fName) << ".AddToList(&";
    680681        out << ToLower(cont->GetName()) << ");" << endl << endl;
    … …  
    691692{
    692693    MParContainer::SetNames(arr);
    693     cout << fContainer << endl;
    694     //    fContainer->ForEach(MParContainer, SetNames)(arr);
    695     TIter Next(fContainer);
    696 
    697     MParContainer *cont = NULL;
    698     while ((cont=(MParContainer*)Next()))
    699     {
    700         cout << cont << " " << cont->GetName() << endl;
    701         cont->SetNames(arr);
    702     }
    703 
    704 }
    705 
     694    fContainer->ForEach(MParContainer, SetNames)(arr);
     695}
     696

  • trunk/MagicSoft/Mars/mbase/MParList.h

    r1474 r1477  
    3232
    3333    enum { kIsOwner = BIT(14) };
     34
     35    void StreamPrimitive(ofstream &out) const;
    3436
    3537public:
    … …  
    7880
    7981    void Print(Option_t *t = NULL) const;
    80     void SavePrimitive(ofstream &out, Option_t *o="");
    8182
    8283    void GetNames(TObjArray &arr) const;

  • trunk/MagicSoft/Mars/mbase/MTask.cc

    r1476 r1477  
    265265// --------------------------------------------------------------------------
    266266//
    267 // Implementation of SavePrimitive. Used to write the call to a constructor
    268 // to a macro. In the original root implementation it is used to write
    269 // gui elements to a macro-file.
    270 //
    271 void MTask::SavePrimitive(ofstream &out, Option_t *o)
     267// First call MParContainer::SavePrimitive which should stream the primitive
     268// to the output stream. Then, if a filter is set, stream first the filter
     269// and afterwards set the filter for this task.
     270//
     271void MTask::SavePrimitive(ofstream &out, Option_t *o="")
    272272{
    273273    MParContainer::SavePrimitive(out);
    274     if (fFilter)
    275         out << "   " << ToLower(fName) << ".SetFilter(&" << ToLower(fFilter->GetName()) <<");" << endl;
    276 }
     274    if (!fFilter)
     275        return;
     276
     277    /*
     278     If we don't stream filter which are not in the task list itself
     279     (which means: alrteady streamed) we may be able to use the
     280     primitive streamer as some kind of validity check for the macros
     281
     282     fFilter->SavePrimitive(out);
     283     out << "   " << ToLower(fName) << ".SetFilter(&" << ToLower(fFilter->GetName()) <<");" << endl;
     284     */
     285}

  • trunk/MagicSoft/Mars/mbase/MTask.h

    r1474 r1477  
    2222{
    2323private:
    24     TList *fListOfBranches; // List of Branch names for auto enabeling scheme
     24    TList *fListOfBranches; //! List of Branch names for auto enabeling scheme
    2525
    2626    const MFilter *fFilter; // Filter for conditional task execution
    2727
    28     Bool_t fIsPreprocessed; // Indicates the success of the PreProcessing (set by MTaskList)
    29     UInt_t fNumExecutions;  // Number of Excutions
     28    Bool_t fIsPreprocessed; //! Indicates the success of the PreProcessing (set by MTaskList)
     29    UInt_t fNumExecutions;  //! Number of Excutions
    3030
    3131    virtual Bool_t PreProcess(MParList *pList);
    … …  
    7171    const MFilter *GetFilter() const      { return fFilter; }
    7272    virtual void PrintStatistics(const Int_t lvl=0) const;
    73     virtual void SavePrimitive(ofstream &out, Option_t *o="");
    7473
    7574    UInt_t GetNumExecutions() { return fNumExecutions; }
    … …  
    8382    const TList *GetListOfBranches() const { return fListOfBranches; }
    8483
    85     ClassDef(MTask, 0) //Abstract base class for a task
     84    void SavePrimitive(ofstream &out, Option_t *o="");
     85
     86    ClassDef(MTask, 1) //Abstract base class for a task
    8687};
    8788

  • trunk/MagicSoft/Mars/mbase/MTaskList.cc

    r1476 r1477  
    520520// gui elements to a macro-file.
    521521//
    522 void MTaskList::SavePrimitive(ofstream &out, Option_t *o)
     522void MTaskList::StreamPrimitive(ofstream &out) const
    523523{
    524524    out << "   MTaskList " << ToLower(fName) << "(\"";

  • trunk/MagicSoft/Mars/mbase/MTaskList.h

    r1474 r1477  
    3333    Bool_t CheckClassForProcess(TClass *cls);
    3434
     35    void StreamPrimitive(ofstream &out) const;
     36
    3537public:
    3638    MTaskList(const char *name=NULL, const char *title=NULL);
    … …  
    5658    void SetOwner(Bool_t enable=kTRUE);
    5759
    58     void SavePrimitive(ofstream &out, Option_t *o="");
    59 
    6060    const TList *GetList() const { return fTasks; }
    6161

  • trunk/MagicSoft/Mars/mfileio/MReadTree.cc

    r1476 r1477  
    783783// gui elements to a macro-file.
    784784//
    785 void MReadTree::SavePrimitive(ofstream &out, Option_t *o)
     785void MReadTree::StreamPrimitive(ofstream &out) const
    786786{
    787787    TString name = ToLower(fName);

  • trunk/MagicSoft/Mars/mfileio/MReadTree.h

    r1472 r1477  
    3636
    3737    virtual void SetReadyToSave(Bool_t flag=kTRUE);
     38    virtual void StreamPrimitive(ofstream &out) const;
    3839
    3940    enum { kIsOwner = BIT(14) };
    … …  
    7273
    7374    virtual Bool_t Notify();
    74     virtual void   SavePrimitive(ofstream &out, Option_t *o="");
    7575
    7676    ClassDef(MReadTree, 1)      // Reads a tree from file(s)

  • trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

    r1476 r1477  
    403403// gui elements to a macro-file.
    404404//
    405 void MWriteRootFile::SavePrimitive(ofstream &out, Option_t *o)
     405void MWriteRootFile::StreamPrimitive(ofstream &out) const
    406406{
    407407    out << "   MWriteRootFile " << ToLower(fName) << "(\"";
    … …  
    416416    while ((entry=(MRootFileBranch*)Next()))
    417417    {
    418         out << "   " << ToLower(fName) << ".AddContainer(\"";
    419         out << entry->GetContName() << "\", \"";
    420         out << entry->GetName() << "\", \"";
     418        if  (entry->GetContainer())
     419        {
     420            entry->GetContainer()->SavePrimitive(out);
     421            out << "&" << ToLower(entry->GetContainer()->GetName());
     422        }
     423        else
     424            out << "\"" << entry->GetContName() << "\"";
     425
     426        out << ", \"" << entry->GetName() << "\", \"";
    421427        out << entry->GetTitle() << "\");" << endl;
    422428    }

  • trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

    r1472 r1477  
    1919    TBranch       *fBranch;     //!
    2020
    21     MParContainer *fContainer;  //!
     21    MParContainer *fContainer;
    2222    TString        fContName;
    2323
    … …  
    7474    const char *GetFileName() const;
    7575
     76    void StreamPrimitive(ofstream &out) const;
     77
    7678public:
    7779    MWriteRootFile();
    … …  
    9294
    9395    void Print(Option_t *t=NULL) const;
    94     void SavePrimitive(ofstream &out, Option_t *o="");
    9596
    9697    ClassDef(MWriteRootFile, 1) // Class to write one container to a root file

  • trunk/MagicSoft/Mars/mhist/MBinning.cc

    r1476 r1477  
    5050
    5151    SetEdges(10, 0, 1);
     52
     53    fType = kIsDefault;
    5254}
    5355
     56// --------------------------------------------------------------------------
     57//
     58// Specify the number of bins (not the number of edges), the lowest and
     59// highest Edge.
     60//
     61void MBinning::SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up)
     62{
     63    const Double_t binsize = (up-lo)/nbins;
     64    fEdges.Set(nbins+1);
     65    for (int i=0; i<=nbins; i++)
     66            fEdges[i] = binsize*i + lo;
     67
     68    fType = kIsLinear;
     69}
     70
     71// --------------------------------------------------------------------------
     72//
     73// Specify the number of bins (not the number of edges), the lowest and
     74// highest Edge.
     75//
     76void MBinning::SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up)
     77{
     78    // if (lo==0) ...
     79
     80    const Double_t binsize = log10(up/lo)/nbins;
     81    fEdges.Set(nbins+1);
     82    for (int i=0; i<=nbins; i++)
     83        fEdges[i] = pow(10, binsize*i) * lo;
     84
     85    fType = kIsLogarithmic;
     86}
    5487
    5588// --------------------------------------------------------------------------
    … …  
    70103// gui elements to a macro-file.
    71104//
    72 void MBinning::SavePrimitive(ofstream &out, Option_t *o)
     105void MBinning::StreamPrimitive(ofstream &out) const
    73106{
    74     out << "   TArrayD dummy;" << endl;
    75     for (int i=0; i<fEdges.GetSize(); i++)
    76         out << "   dummy[" << i << "]=" << fEdges[i] << ";" << endl;
    77107    out << "   MBinning " << ToLower(fName) << "(\"";
    78108    out << fName << "\", \"" << fTitle << "\");" << endl;
    79     out << "   " << ToLower(fName) << ".SetEdges(dummy);" << endl;
     109
     110    if (IsDefault())
     111        return;
     112
     113    if (IsLinear() || IsLogarithmic())
     114    {
     115        out << "   " << ToLower(fName) << ".SetEdges";
     116        if (IsLogarithmic())
     117            out << "Log";
     118        out << "(" << GetNumBins() << ", " << GetEdgeLo() << ", " << GetEdgeHi() << ");" << endl;
     119        return;
     120    }
     121
     122    out << "   {" << endl;
     123    out << "      TArrayD dummy;" << endl;
     124    for (int i=0; i<GetNumEdges(); i++)
     125        out << "      dummy[" << i << "]=" << GetEdges()[i] << ";" << endl;
     126    out << "      " << ToLower(fName) << ".SetEdges(dummy);" << endl;
     127    out << "   }" << endl;
    80128}

  • trunk/MagicSoft/Mars/mhist/MBinning.h

    r1474 r1477  
    1717    TArrayD fEdges;
    1818
     19    Byte_t  fType;
     20
     21    void StreamPrimitive(ofstream &out) const;
     22
     23    enum {
     24        kIsDefault,
     25        kIsLinear,
     26        kIsLogarithmic,
     27        kIsUserArray
     28    };
     29
    1930public:
    2031    MBinning(const char *name=NULL, const char *title=NULL);
    … …  
    2334    {
    2435        fEdges = arr;
     36        fType = kIsUserArray;
    2537    }
    2638
    27     void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up)
    28     {
    29         const Double_t binsize = (up-lo)/nbins;
    30         fEdges.Set(nbins+1);
    31         for (int i=0; i<=nbins; i++)
    32             fEdges[i] = binsize*i + lo;
    33     }
    34 
    35     void SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up)
    36     {
    37         // if (lo==0) ...
    38 
    39         const Double_t binsize = log10(up/lo)/nbins;
    40         fEdges.Set(nbins+1);
    41         for (int i=0; i<=nbins; i++)
    42             fEdges[i] = pow(10, binsize*i) * lo;
    43     }
     39    void SetEdges(const Int_t nbins, const Axis_t lo, Axis_t up);
     40    void SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up);
    4441
    4542    // FIXME: ROOT workaround: "operator[] const" missing
    46     Double_t GetEdgeLo() const { return (*(TArrayD*)(&fEdges))[0]; }
    47     Double_t GetEdgeHi() const { return (*(TArrayD*)(&fEdges))[fEdges.GetSize()-1]; }
     43    Double_t GetEdgeLo() const { return ((TArrayD)fEdges)[0]; }
     44    Double_t GetEdgeHi() const { return ((TArrayD)fEdges)[fEdges.GetSize()-1]; }
    4845
    4946    Int_t GetNumEdges() const { return fEdges.GetSize(); }
    … …  
    5249    Double_t *GetEdges() const { return fEdges.GetArray(); }
    5350
     51    Bool_t IsLinear() const { return fType==kIsLinear; }
     52    Bool_t IsLogarithmic() const { return fType==kIsLogarithmic; }
     53    Bool_t IsDefault() const { return fType==kIsDefault; }
     54    Bool_t IsUserArray() const { return fType==kIsUserArray; }
     55
    5456    void Apply(TH1 &);
    55 
    56     void SavePrimitive(ofstream &out, Option_t *o="");
    5757
    5858    ClassDef(MBinning, 1) //Container to store the binning of a histogram

  • trunk/MagicSoft/Mars/mhist/MFillH.cc

    r1476 r1477  
    156156//
    157157//
    158 MFillH::MFillH(const char *hist, const MParContainer *par, const char *name, const char *title)
     158MFillH::MFillH(const char *hist, MParContainer *par, const char *name, const char *title)
    159159{
    160160    Init(name, title);
    … …  
    192192//   derived from MH)
    193193//
    194 MFillH::MFillH(MH *hist, const MParContainer *par, const char *name, const char *title)
     194MFillH::MFillH(MH *hist, MParContainer *par, const char *name, const char *title)
    195195{
    196196    Init(name, title);
    … …  
    350350// gui elements to a macro-file.
    351351//
    352 void MFillH::SavePrimitive(ofstream &out, Option_t *o)
    353 {
    354     out << "   MFillH " << ToLower(fName) << "(\"";
    355     out << fHName << "\", \"" << fParContainerName << "\");" << endl;
    356 }
     352void MFillH::StreamPrimitive(ofstream &out) const
     353{
     354    if (fH)
     355        fH->SavePrimitive(out);
     356
     357    if (fParContainer)
     358        fParContainer->SavePrimitive(out);
     359
     360    out << "   MFillH " << ToLower(fName) << "(";
     361
     362    if (fH)
     363        out << "&" << ToLower(fH->GetName());
     364    else
     365        out << "\"" << fHName << "\"";
     366    out << ", ";
     367
     368    if (fParContainer)
     369        out << "&" << ToLower(fParContainer->GetName());
     370    else
     371        out << "\"" << fParContainerName << "\"";
     372
     373    out << ");" << endl;
     374}

  • trunk/MagicSoft/Mars/mhist/MFillH.h

    r1472 r1477  
    1212{
    1313private:
    14     const MParContainer *fParContainer; //!
     14    MParContainer *fParContainer;
    1515    TString fParContainerName;
    1616
    17     MH* fH;                             //!
     17    MH* fH;                   
    1818    TString fHName;
    1919
    … …  
    2323    void Init(const char *name, const char *title);
    2424
     25    void StreamPrimitive(ofstream &out) const;
     26
    2527public:
    2628    MFillH();
    27     MFillH(const char *hist, const char *par=NULL,     const char *name=NULL, const char *title=NULL);
    28     MFillH(const char *hist, const MParContainer *par, const char *name=NULL, const char *title=NULL);
    29     MFillH(MH *hist,         const char *par=NULL,     const char *name=NULL, const char *title=NULL);
    30     MFillH(MH *hist,         const MParContainer *par, const char *name=NULL, const char *title=NULL);
     29    MFillH(const char *hist, const char *par=NULL, const char *name=NULL, const char *title=NULL);
     30    MFillH(const char *hist, MParContainer *par,  const char *name=NULL, const char *title=NULL);
     31    MFillH(MH *hist,         const char *par=NULL, const char *name=NULL, const char *title=NULL);
     32    MFillH(MH *hist,         MParContainer *par,  const char *name=NULL, const char *title=NULL);
    3133
    3234    Bool_t PreProcess(MParList *pList);
    3335    Bool_t Process();
    3436    Bool_t PostProcess();
    35 
    36     void SavePrimitive(ofstream &out, Option_t *o="");
    3737
    3838    ClassDef(MFillH, 1) // Task to fill a histogram with data from a parameter container

  • trunk/MagicSoft/Mars/mhist/MH3.cc

    r1476 r1477  
    384384// gui elements to a macro-file.
    385385//
    386 void MH3::SavePrimitive(ofstream &out, Option_t *o)
     386void MH3::StreamPrimitive(ofstream &out)
    387387{
    388388    TString name = ToLower(fName);

  • trunk/MagicSoft/Mars/mhist/MH3.h

    r1474 r1477  
    2323    MDataChain *fData[3];        // Object from which the data is filled
    2424    Double_t    fScale[3];
     25
     26    void StreamPrimitive(ofstream &out);
    2527
    2628public:
    … …  
    4951    TObject *DrawClone(Option_t *opt=NULL) const;
    5052
    51     void SavePrimitive(ofstream &out, Option_t *o="");
    52 
    5353    ClassDef(MH3, 1) // Generalized 1/2/3D-histogram for Mars variables
    5454};
Note: See TracChangeset for help on using the changeset viewer.