Changeset 7804


Ignore:
Timestamp:
07/26/06 11:46:55 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
94 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7803 r7804  
    3333   * mbase/MContinue.h:
    3434     - some reformatting
     35
     36   * manalysis/MEventRateCalc.[h,cc], manalysis/MGeomApply.[h,cc],
     37     manalysis/MMultiDimDistCalc.[h,cc], mbadpixels/MBadPixelsTreat.[h,cc],
     38     mbase/MEvtLoop.[h,cc], mbase/MParContainer.[h,cc], mbase/MParList.[h,cc],
     39     mbase/MTask.[h,cc], mbase/MTaskList.[h,cc], mcalib/MCalibrateData.[h,cc],
     40     mdata/MDataArray.[h,cc], mfbase/MF.[h,cc], mfbase/MFDataChain.[h,cc],
     41     mfbase/MFDataChain.[h,cc], mfbase/MFDataMember.[h,cc],
     42     mfbase/MFilterList.[h,cc], mfileio/MReadTree.[h,cc],
     43     mfileio/MWriteRootFile.[h,cc], mfilter/MFParticleId.[h,cc],
     44     mfilter/MFTriggerLvl1.[h,cc], mfilter/MFTriggerLvl2.[h,cc],
     45     mhbase/MBinning.[h,cc], mhbase/MFillH.[h,cc], mhbase/MH3.[h,cc],
     46     mhbase/MHMatrix.[h,cc], mimage/MHillasCalc.[h,cc],
     47     mimage/MImgCleanStd.[h,cc], mimage/MImgCleanTGB.[h,cc],
     48     mpointing/MSrcPosCam.[h,cc], msignal/MExtractFixedWindow.[h,cc],
     49     msignal/MExtractSignal.[h,cc], msignal/MExtractSignalABcorr.[h,cc],
     50     msignal/MExtractor.[h,cc], mtools/MChisqEval.[h,cc]
     51     - replaced StreamPrimitive(ofstream&) by StreamPrimitive(ostream&)
     52     - replaced SavePrimitive(ofstream&) by SsavePrimitive(ostream&)
     53     - if necessary let SavePrimitive(ofstream&) call
     54       SavePrimitive(ostream&)
     55
     56   * mbadpixels/MBadPixelsCam.cc, mbadpixels/MBadPixelsIntensityCam.cc,
     57     mbase/MEvtLoop.cc, mbase/MLog.cc, mbase/MParList.cc, mbase/MTaskList.cc,
     58     mcalib/MCalibConstCam.cc, mcalib/MCalibrationBlindCam.cc,
     59     mcalib/MCalibrationCam.cc, mcalib/MCalibrationIntensityCam.cc,
     60     mcalib/MCalibrationIntensityConstCam.cc, mdata/MDataArray.cc,
     61     mdata/MDataFormula.cc, mdata/MDataList.cc, mfbase/MFilterList.cc,
     62     mgeom/MGeomCam.cc, mhcalib/MHCalibrationCam.cc, mmain/MMonteCarlo.cc,
     63     mpedestal/MPedPhotCam.cc, mpedestal/MPedestalCam.cc,
     64     mreport/MReportFileRead.cc, msignal/MArrivalTimeCam.cc,
     65     msignal/MExtractedSignalCam.cc, msignal/MSignalCam.cc:
     66     - replaced ForEach by R__FOR_EACH
     67
     68   * mbase/MAGIC.h:
     69     - define R__FOR_EACH macro if not yet defined
     70
     71   * mbase/MEvtLoop.cc:
     72     - removed usage of copy-constructor of TEnv
     73
     74   * mbase/MString.h:
     75     - exclude some of the member function from CINT (gives problem
     76       with CINT)
     77
     78   * mfbase/MFEventSelector.[h,cc]:
     79     - removed StreamPrimitive (it was empty anyhow)
     80
     81   * mranforest/MRanTree.cc:
     82     - moved includes for TVector and TMatrix to header
     83     - replaced TMatrixRow by TMatrixFRow_const in TreeHad
     84
     85   * msignal/Makefile, msignal/SignalLinkDef.h:
     86     - removed MExtractSignal
     87     - removed MExtractSignal2
     88     - removed MExtractSignal3
     89     - removed MExtractSignalABcorr
     90
    3591
    3692

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

    r7033 r7804  
    212212// gui elements to a macro-file.
    213213//
    214 void MEventRateCalc::StreamPrimitive(ofstream &out) const
     214void MEventRateCalc::StreamPrimitive(ostream &out) const
    215215{
    216216    out << "   MEventRateCalc " << GetUniqueName() << "(";

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

    r6455 r7804  
    4545    Int_t  Process();
    4646
    47     void  StreamPrimitive(ofstream &out) const;
     47    void  StreamPrimitive(ostream &out) const;
    4848    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    4949

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

    r7188 r7804  
    222222// gui elements to a macro-file.
    223223//
    224 void MGeomApply::StreamPrimitive(ofstream &out) const
     224void MGeomApply::StreamPrimitive(ostream &out) const
    225225{
    226226    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";

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

    r5844 r7804  
    2222    Int_t  PreProcess(MParList *plist);
    2323    Bool_t ReInit(MParList *pList);
    24     void   StreamPrimitive(ofstream &out) const;
     24    void   StreamPrimitive(ostream &out) const;
    2525
    2626public:

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

    r6982 r7804  
    199199}
    200200
    201 void MMultiDimDistCalc::StreamPrimitive(ofstream &out) const
     201void MMultiDimDistCalc::StreamPrimitive(ostream &out) const
    202202{
    203203    out << "   MMultiDimDist " << GetUniqueName();
    … …  
    218218        out << "   " << GetUniqueName() << ".SetUseKernelMethod();" << endl;
    219219}
     220

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

    r7130 r7804  
    2626    MDataArray  *fData;       //! Used to store the MDataChains to get the event values
    2727
    28     void  StreamPrimitive(ofstream &out) const;
     28    void  StreamPrimitive(ostream &out) const;
     29
    2930    Int_t PreProcess(MParList *plist);
    3031    Int_t Process();

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

    r7375 r7804  
    166166void MBadPixelsCam::Clear(Option_t *o)
    167167{
    168     fArray->ForEach(TObject, Clear)();
     168    fArray->R__FOR_EACH(TObject, Clear)();
    169169}
    170170
    … …  
    175175void MBadPixelsCam::Reset()
    176176{
    177     fArray->ForEach(MParContainer, Reset)();
     177    fArray->R__FOR_EACH(MParContainer, Reset)();
    178178}
    179179

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc

    r7189 r7804  
    125125{
    126126
    127   fCams->ForEach(MBadPixelsCam, Clear)();
     127  fCams->R__FOR_EACH(MBadPixelsCam, Clear)();
    128128
    129129  return;
    … …  
    136136void MBadPixelsIntensityCam::Print(Option_t *o) const
    137137{
    138   fCams->ForEach(MBadPixelsCam, Print)(o);
     138  fCams->R__FOR_EACH(MBadPixelsCam, Print)(o);
    139139}
    140140
    … …  
    184184    InitSize(1);
    185185
    186   fCams->ForEach(MBadPixelsCam,Init)(geom);
     186  fCams->R__FOR_EACH(MBadPixelsCam,Init)(geom);
    187187}
    188188

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

    r7736 r7804  
    563563}
    564564
    565 void MBadPixelsTreat::StreamPrimitive(ofstream &out) const
     565void MBadPixelsTreat::StreamPrimitive(ostream &out) const
    566566{
    567567    out << "   MBadPixelsTreat " << GetUniqueName();

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

    r7733 r7804  
    5454    Int_t  Process();
    5555    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    56     void   StreamPrimitive(ofstream &out) const;
     56
     57    void   StreamPrimitive(ostream &out) const;
    5758
    5859public:

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

    r3710 r7804  
    2121#endif
    2222
     23#ifndef R__FOR_EACH
     24#define R__FOR_EACH ForEach
     25#endif
     26
     27
    2328//
    2429// Values for the eventloop control

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

    r7130 r7804  
    736736// gui elements to a macro-file.
    737737//
    738 void MEvtLoop::StreamPrimitive(ofstream &out) const
     738void MEvtLoop::StreamPrimitive(ostream &out) const
    739739{
    740740    out << "   MEvtLoop " << GetUniqueName();
    … …  
    747747//
    748748//
    749 void MEvtLoop::SavePrimitive(ofstream &out, Option_t *opt)
     749void MEvtLoop::SavePrimitive(ostream &out, Option_t *opt)
    750750{
    751751    TString options = opt;
    … …  
    767767        {
    768768            *fLog << err << "MEvtLoop::SavePrimitive - Error: old file not closed." << endl;
    769             gListOfPrimitives->ForEach(TObject, ResetBit)(BIT(15));
     769            gListOfPrimitives->R__FOR_EACH(TObject, ResetBit)(BIT(15));
    770770            delete gListOfPrimitives;
    771771        }
    … …  
    788788        return;
    789789
    790     gListOfPrimitives->ForEach(TObject, ResetBit)(BIT(15));
     790    gListOfPrimitives->R__FOR_EACH(TObject, ResetBit)(BIT(15));
    791791    delete gListOfPrimitives;
    792792    gListOfPrimitives = 0;
     793}
     794
     795void MEvtLoop::SavePrimitive(ofstream &out, Option_t *o)
     796{
     797    SavePrimitive(static_cast<ostream&>(out), o);
    793798}
    794799
    … …  
    10411046    }
    10421047
    1043     return ReadEnv(TEnv(config), "", print);
     1048    const TEnv env(config);
     1049    return ReadEnv(env, "", print);
    10441050}
    10451051

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

    r7071 r7804  
    3737    Bool_t HasDuplicateNames(TObjArray &arr, const TString txt) const;
    3838
    39     void StreamPrimitive(ofstream &out) const;
     39    void StreamPrimitive(ostream &out) const;
    4040
    4141    Bool_t ProcessGuiEvents(Int_t num);
    … …  
    7878    void MakeMacro(const char *filename="evtloop.C");
    7979
     80    void SavePrimitive(ostream &out, Option_t *o="");
    8081    void SavePrimitive(ofstream &out, Option_t *o="");
    8182

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

    r7438 r7804  
    264264    SetBit(kIsUnderlined);
    265265
    266     fPlugins->ForEach(MLogPlugin, Underline)();
     266    fPlugins->R__FOR_EACH(MLogPlugin, Underline)();
    267267
    268268    if (TestBit(eNoColors))
    … …  
    353353        fOut->write(fBase, len);
    354354
    355     fPlugins->ForEach(MLogPlugin, SetColor)(fOutputLevel);
    356     fPlugins->ForEach(MLogPlugin, WriteBuffer)(fBase, len);
     355    fPlugins->R__FOR_EACH(MLogPlugin, SetColor)(fOutputLevel);
     356    fPlugins->R__FOR_EACH(MLogPlugin, WriteBuffer)(fBase, len);
    357357
    358358    if (fDevice&eGui && fGui)

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

    r7179 r7804  
    682682// gui elements to a macro-file.
    683683//
    684 void MParContainer::SavePrimitive(ofstream &out, Option_t *o)
     684void MParContainer::SavePrimitive(ostream &out, Option_t *o)
    685685{
    686686    static UInt_t uid = 0;
    … …  
    698698}
    699699
     700void MParContainer::SavePrimitive(ofstream &out, Option_t *o)
     701{
     702    SavePrimitive(static_cast<ostream&>(out));
     703}
     704
    700705// --------------------------------------------------------------------------
    701706//
    702707// Creates the string written by SavePrimitive and returns it.
    703708//
    704 void MParContainer::StreamPrimitive(ofstream &out) const
     709void MParContainer::StreamPrimitive(ostream &out) const
    705710{
    706711    out << "   // Using MParContainer::StreamPrimitive" << endl;

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

    r6949 r7804  
    9494    virtual void   Print(Option_t *option="") const;
    9595    virtual Int_t  Sizeof() const;
     96    virtual void   SavePrimitive(ostream &out, Option_t *o="");
    9697    virtual void   SavePrimitive(ofstream &out, Option_t *o="");
    9798
    … …  
    108109    virtual void SetDisplay(MStatusDisplay *d) { fDisplay = d; }
    109110
    110     // FIXME: Change to ostream! Seems to be difficult, because
    111     //        MTaskListStreamPrimitive calls SavePrimitive(ofstream&).
    112     //        Maybe with a cast?
    113     virtual void StreamPrimitive(ofstream &out) const;
     111    virtual void StreamPrimitive(ostream &out) const;
    114112
    115113    TMethodCall *GetterMethod(const char *name) const;

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

    r7413 r7804  
    160160void MParList::SetLogStream(MLog *log)
    161161{
    162     fContainer->ForEach(MParContainer, SetLogStream)(log);
     162    fContainer->R__FOR_EACH(MParContainer, SetLogStream)(log);
    163163    MParContainer::SetLogStream(log);
    164164}
    … …  
    166166void MParList::SetDisplay(MStatusDisplay *d)
    167167{
    168     fContainer->ForEach(MParContainer, SetDisplay)(d);
     168    fContainer->R__FOR_EACH(MParContainer, SetDisplay)(d);
    169169    MParContainer::SetDisplay(d);
    170170}
    … …  
    659659void MParList::SetReadyToSave(Bool_t flag)
    660660{
    661     fContainer->ForEach(MParContainer, SetReadyToSave)(flag);
     661    fContainer->R__FOR_EACH(MParContainer, SetReadyToSave)(flag);
    662662    MParContainer::SetReadyToSave(flag);
    663663}
    … …  
    669669void MParList::Reset()
    670670{
    671     fContainer->ForEach(MParContainer, Reset)();
     671    fContainer->R__FOR_EACH(MParContainer, Reset)();
    672672}
    673673
    … …  
    841841}
    842842
    843 void MParList::SavePrimitive(ofstream &out, Option_t *o)
     843void MParList::SavePrimitive(ostream &out, Option_t *o)
    844844{
    845845    Bool_t saved = IsSavedAsPrimitive();
    … …  
    867867}
    868868
     869void MParList::SavePrimitive(ofstream &out, Option_t *o)
     870{
     871    SavePrimitive(static_cast<ostream&>(out), o);
     872}
     873
    869874// --------------------------------------------------------------------------
    870875//
    … …  
    873878// gui elements to a macro-file.
    874879//
    875 void MParList::StreamPrimitive(ofstream &out) const
     880void MParList::StreamPrimitive(ostream &out) const
    876881{
    877882    out << "   MParList " << GetUniqueName();
    … …  
    894899{
    895900    MParContainer::GetNames(arr);
    896     fContainer->ForEach(MParContainer, GetNames)(arr);
     901    fContainer->R__FOR_EACH(MParContainer, GetNames)(arr);
    897902}
    898903
    … …  
    905910{
    906911    MParContainer::SetNames(arr);
    907     fContainer->ForEach(MParContainer, SetNames)(arr);
     912    fContainer->R__FOR_EACH(MParContainer, SetNames)(arr);
    908913}
    909914

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

    r7413 r7804  
    3535    enum { kIsOwner = BIT(14) };
    3636
    37     void StreamPrimitive(ofstream &out) const;
     37    void StreamPrimitive(ostream &out) const;
    3838
    3939    void Init(const char *name, const char *title);
    … …  
    9797    void SetNames(TObjArray &arr);
    9898
     99    void SavePrimitive(ostream &out, Option_t *o="");
    99100    void SavePrimitive(ofstream &out, Option_t *o="");
    100101

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

    r7179 r7804  
    1313public:
    1414    MString(const char *txt=0)  : TString(txt) { }
    15     MString(const TString &txt) : TString(txt) { }
     15    MString(const MString &txt) : TString(txt) { }
    1616
    1717    MString &Print(const char *fmt, va_list &ap);
    1818    MString &Print(const char *fmt, ...);
     19
     20#ifndef __CINT__
    1921    static MString Form(const char *fmt, ...);
     22#endif
    2023
    2124    ClassDef(MString, 1) // Tool to make Form() thread safe against other TStrings

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

    r7601 r7804  
    455455// and afterwards set the filter for this task.
    456456//
    457 void MTask::SavePrimitive(ofstream &out, Option_t *o)
     457void MTask::SavePrimitive(ostream &out, Option_t *o)
    458458{
    459459    MParContainer::SavePrimitive(out);
    … …  
    471471    if (fSerialNumber>0)
    472472        out << "   " << GetUniqueName() << ".SetSerialNumber(" << fSerialNumber <<");" << endl;
     473}
     474
     475void MTask::SavePrimitive(ofstream &out, Option_t *o)
     476{
     477    SavePrimitive(static_cast<ostream&>(out), o);
    473478}
    474479

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

    r7601 r7804  
    120120    virtual Int_t CallPostProcess();
    121121
     122    void SavePrimitive(ostream &out, Option_t *o="");
    122123    void SavePrimitive(ofstream &out, Option_t *o="");
    123124

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

    r7688 r7804  
    144144void MTaskList::SetLogStream(MLog *log)
    145145{
    146     fTasks->ForEach(MTask, SetLogStream)(log);
     146    fTasks->R__FOR_EACH(MTask, SetLogStream)(log);
    147147    MTask::SetLogStream(log);
    148148}
    … …  
    154154void MTaskList::SetDisplay(MStatusDisplay *d)
    155155{
    156     fTasks->ForEach(MTask, SetDisplay)(d);
     156    fTasks->R__FOR_EACH(MTask, SetDisplay)(d);
    157157    MTask::SetDisplay(d);
    158158}
    … …  
    160160void MTaskList::SetAccelerator(Byte_t acc)
    161161{
    162     fTasks->ForEach(MTask, SetAccelerator)(acc);
     162    fTasks->R__FOR_EACH(MTask, SetAccelerator)(acc);
    163163    MTask::SetAccelerator(acc);
    164164}
    … …  
    171171void MTaskList::SetSerialNumber(Byte_t num)
    172172{
    173     fTasks->ForEach(MTask, SetSerialNumber)(num);
     173    fTasks->R__FOR_EACH(MTask, SetSerialNumber)(num);
    174174    MTask::SetSerialNumber(num);
    175175}
    … …  
    802802    //  create the Iterator for the TaskList
    803803    //
    804     fTasks->ForEach(MTask, PrintStatistics)(lvl+1, title, GetCpuTime());
     804    fTasks->R__FOR_EACH(MTask, PrintStatistics)(lvl+1, title, GetCpuTime());
    805805
    806806    if (lvl==0)
    … …  
    827827// gui elements to a macro-file.
    828828//
    829 void MTaskList::StreamPrimitive(ofstream &out) const
     829void MTaskList::StreamPrimitive(ostream &out) const
    830830{
    831831    out << "   MTaskList " << GetUniqueName();
    … …  
    853853{
    854854    MParContainer::GetNames(arr);
    855     fTasks->ForEach(MParContainer, GetNames)(arr);
     855    fTasks->R__FOR_EACH(MParContainer, GetNames)(arr);
    856856}
    857857
    … …  
    859859{
    860860    MParContainer::SetNames(arr);
    861     fTasks->ForEach(MParContainer, SetNames)(arr);
     861    fTasks->R__FOR_EACH(MParContainer, SetNames)(arr);
    862862}
    863863

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

    r7688 r7804  
    3131
    3232    void   Remove(MTask *task);
    33     void   StreamPrimitive(ofstream &out) const;
     33    void   StreamPrimitive(ostream &out) const;
    3434    Bool_t CheckAddToList(MTask *task, const char *tType, const MTask *where=NULL) const;
    3535

  • trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc

    r7188 r7804  
    227227void MCalibConstCam::Clear(Option_t *o)
    228228{
    229     { fArray->ForEach(TObject, Clear)(); }
    230     { fAverageAreas->ForEach(TObject, Clear)(); }
    231     { fAverageSectors->ForEach(TObject, Clear)(); }
     229    { fArray->R__FOR_EACH(TObject, Clear)(); }
     230    { fAverageAreas->R__FOR_EACH(TObject, Clear)(); }
     231    { fAverageSectors->R__FOR_EACH(TObject, Clear)(); }
    232232 
    233233}

  • trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

    r7575 r7804  
    845845// gui elements to a macro-file.
    846846//
    847 void MCalibrateData::StreamPrimitive(ofstream &out) const
     847void MCalibrateData::StreamPrimitive(ostream &out) const
    848848{
    849849    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";

  • trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

    r7374 r7804  
    9797  Int_t  Process();
    9898  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    99   void   StreamPrimitive(ofstream &out) const;
     99  void   StreamPrimitive(ostream &out) const;
    100100 
    101101public:

  • trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.cc

    r7188 r7804  
    171171
    172172  fPulserColor = col;
    173   fPixels->ForEach(MCalibrationBlindPix, SetColor)(col);
     173  fPixels->R__FOR_EACH(MCalibrationBlindPix, SetColor)(col);
    174174
    175175}

  • trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

    r7200 r7804  
    170170void MCalibrationCam::Clear(Option_t *o)
    171171{
    172 
    173   {  fPixels        ->ForEach(TObject, Clear)();  }
    174   {  fAverageAreas  ->ForEach(TObject, Clear)();  }
    175   {  fAverageSectors->ForEach(TObject, Clear)();  }
    176  
    177   return;
     172    { fPixels        ->R__FOR_EACH(TObject, Clear)();  }
     173    { fAverageAreas  ->R__FOR_EACH(TObject, Clear)();  }
     174    { fAverageSectors->R__FOR_EACH(TObject, Clear)();  }
    178175}
    179176

  • trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

    r7189 r7804  
    187187void MCalibrationIntensityCam::Clear(Option_t *o)
    188188{
    189     fCams->ForEach(MCalibrationCam, Clear)();
    190     fHists->ForEach(MHCalibrationCam, Clear)();
     189    fCams->R__FOR_EACH(MCalibrationCam, Clear)();
     190    fHists->R__FOR_EACH(MHCalibrationCam, Clear)();
    191191}
    192192
    … …  
    197197void MCalibrationIntensityCam::Print(Option_t *o) const
    198198{
    199     fCams->ForEach(MCalibrationCam, Print)(o);
    200     fHists->ForEach(MHCalibrationCam, Print)(o);
     199    fCams->R__FOR_EACH(MCalibrationCam, Print)(o);
     200    fHists->R__FOR_EACH(MHCalibrationCam, Print)(o);
    201201}
    202202
    … …  
    244244    InitSize(1);
    245245
    246   fCams->ForEach(MCalibrationCam,Init)(geom);
     246  fCams->R__FOR_EACH(MCalibrationCam,Init)(geom);
    247247}
    248248

  • trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityConstCam.cc

    r7195 r7804  
    113113void MCalibrationIntensityConstCam::Clear(Option_t *o)
    114114{
    115 
    116   fCams->ForEach(MCalibConstCam, Clear)();
    117   return;
     115  fCams->R__FOR_EACH(MCalibConstCam, Clear)();
    118116}
    119117
    … …  
    124122void MCalibrationIntensityConstCam::Print(Option_t *o) const
    125123{
    126   fCams->ForEach(MCalibConstCam, Print)(o);
     124  fCams->R__FOR_EACH(MCalibConstCam, Print)(o);
    127125}
    128126
    … …  
    160158    InitSize(1);
    161159
    162   fCams->ForEach(MCalibConstCam,Init)(geom);
     160  fCams->R__FOR_EACH(MCalibConstCam,Init)(geom);
    163161}
    164162

  • trunk/MagicSoft/Mars/mdata/MDataArray.cc

    r7749 r7804  
    187187Bool_t MDataArray::AsciiWrite(ostream &out) const
    188188{
    189     ((TObjArray)fList).ForEach(MParContainer, AsciiWrite)(out);
     189    ((TObjArray)fList).R__FOR_EACH(MParContainer, AsciiWrite)(out);
    190190    return kTRUE;
    191191}
    … …  
    197197// gui elements to a macro-file.
    198198//
    199 void MDataArray::StreamPrimitive(ofstream &out) const
     199void MDataArray::StreamPrimitive(ostream &out) const
    200200{
    201201    out << "   MDataArray " << GetUniqueName();
    … …  
    255255void MDataArray::SetVariables(const TArrayD &arr)
    256256{
    257     fList.ForEach(MData, SetVariables)(arr);
    258 }
     257    fList.R__FOR_EACH(MData, SetVariables)(arr);
     258}

  • trunk/MagicSoft/Mars/mdata/MDataArray.h

    r7749 r7804  
    2626    TObjArray fList;
    2727
    28     void StreamPrimitive(ofstream &out) const;
     28    void StreamPrimitive(ostream &out) const;
    2929
    3030public:

  • trunk/MagicSoft/Mars/mdata/MDataFormula.cc

    r7784 r7804  
    317317void MDataFormula::SetVariables(const TArrayD &arr)
    318318{
    319     fMembers.ForEach(MData, SetVariables)(arr);
    320 }
    321 
     319    fMembers.R__FOR_EACH(MData, SetVariables)(arr);
     320}
     321

  • trunk/MagicSoft/Mars/mdata/MDataList.cc

    r3666 r7804  
    398398void MDataList::SetVariables(const TArrayD &arr)
    399399{
    400     fMembers.ForEach(MData, SetVariables)(arr);
    401 }
     400    fMembers.R__FOR_EACH(MData, SetVariables)(arr);
     401}

  • trunk/MagicSoft/Mars/mfbase/MF.cc

    r7601 r7804  
    414414}
    415415
    416 void MF::StreamPrimitive(ofstream &out) const
     416void MF::StreamPrimitive(ostream &out) const
    417417{
    418418    out << "   MF " << GetUniqueName();

  • trunk/MagicSoft/Mars/mfbase/MF.h

    r6932 r7804  
    3131    MFilter *ParseString(TString txt, Int_t level);
    3232
    33     void StreamPrimitive(ofstream &out) const;
     33    void StreamPrimitive(ostream &out) const;
    3434
    3535public:

  • trunk/MagicSoft/Mars/mfbase/MFDataChain.cc

    r6869 r7804  
    146146//  Crahses if default constructor called.
    147147//
    148 void MFDataChain::StreamPrimitive(ofstream &out) const
     148void MFDataChain::StreamPrimitive(ostream &out) const
    149149{
    150150    out << "   MFDataChain " << GetUniqueName() << "(\"";

  • trunk/MagicSoft/Mars/mfbase/MFDataChain.h

    r5875 r7804  
    2828    Bool_t  fResult;           //!
    2929
    30     void StreamPrimitive(ofstream &out) const;
     30    void StreamPrimitive(ostream &out) const;
    3131
    3232    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mfbase/MFDataMember.cc

    r5875 r7804  
    139139}
    140140
    141 void MFDataMember::StreamPrimitive(ofstream &out) const
     141void MFDataMember::StreamPrimitive(ostream &out) const
    142142{
    143143    out << "   MFDataMember " << GetUniqueName() << "(\"";

  • trunk/MagicSoft/Mars/mfbase/MFDataMember.h

    r5875 r7804  
    2222    Double_t fValue;
    2323
    24     void StreamPrimitive(ofstream &out) const;
     24    void StreamPrimitive(ostream &out) const;
    2525
    2626    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mfbase/MFEventSelector.cc

    r7418 r7804  
    208208    return kTRUE;
    209209}
    210 
    211 void MFEventSelector::StreamPrimitive(ofstream &out) const
    212 {
    213     /*
    214     out << "   MF " << GetUniqueName();
    215 
    216     if (!fFilter)
    217     {
    218         out << ";" << endl;
    219         return;
    220     }
    221 
    222     out << "(\"" << fFilter->GetRule() << "\"";
    223         if (fName!=gsDefName || fTitle!=gsDefTitle)
    224     {
    225         out << "(\"" << fName << "\"";
    226         if (fTitle!=gsDefTitle)
    227             out << ", \"" << fTitle << "\"";
    228     }
    229     out << ");" << endl;
    230     */
    231 }

  • trunk/MagicSoft/Mars/mfbase/MFEventSelector.h

    r3330 r7804  
    1919    Bool_t  fResult;          //! Reseult of a single selection
    2020
    21     void StreamPrimitive(ofstream &out) const;
    22 
    2321    Int_t PreProcess(MParList *pList);
    2422    Int_t Process();

  • trunk/MagicSoft/Mars/mfbase/MFilterList.cc

    r7643 r7804  
    264264void MFilterList::SetAccelerator(Byte_t acc)
    265265{
    266     fFilters.ForEach(MTask, SetAccelerator)(acc);
     266    fFilters.R__FOR_EACH(MTask, SetAccelerator)(acc);
    267267    MFilter::SetAccelerator(acc);
    268268}
    … …  
    377377// gui elements to a macro-file.
    378378//
    379 void MFilterList::StreamPrimitive(ofstream &out) const
     379void MFilterList::StreamPrimitive(ostream &out) const
    380380{
    381381    out << "   MFilterList " << ToLower(fName) << "(\"";
    … …  
    506506void MFilterList::SetVariables(const TArrayD &arr)
    507507{
    508     fFilters.ForEach(MFilter, SetVariables)(arr);
    509 }
     508    fFilters.R__FOR_EACH(MFilter, SetVariables)(arr);
     509}

  • trunk/MagicSoft/Mars/mfbase/MFilterList.h

    r7643 r7804  
    2929    enum { kIsOwner = BIT(14) };
    3030
    31     void StreamPrimitive(ofstream &out) const;
     31    void StreamPrimitive(ostream &out) const;
    3232
    3333    void Init(const char *name, const char *title);

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

    r7724 r7804  
    11981198// gui elements to a macro-file.
    11991199//
    1200 void MReadTree::StreamPrimitive(ofstream &out) const
     1200void MReadTree::StreamPrimitive(ostream &out) const
    12011201{
    12021202    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";

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

    r7115 r7804  
    4646
    4747    virtual void SetReadyToSave(Bool_t flag=kTRUE);
    48     virtual void StreamPrimitive(ofstream &out) const;
     48    virtual void StreamPrimitive(ostream &out) const;
    4949
    5050    enum { kIsOwner = BIT(14) };

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

    r7358 r7804  
    10681068// gui elements to a macro-file.
    10691069//
    1070 void MWriteRootFile::StreamPrimitive(ofstream &out) const
     1070void MWriteRootFile::StreamPrimitive(ostream &out) const
    10711071{
    10721072    out << "   MWriteRootFile " << GetUniqueName();

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

    r7001 r7804  
    108108    // MTask
    109109    Bool_t ReInit(MParList *pList);
    110     void   StreamPrimitive(ofstream &out) const;
     110    void   StreamPrimitive(ostream &out) const;
    111111
    112112    // Constructor

  • trunk/MagicSoft/Mars/mfilter/MFParticleId.cc

    r3502 r7804  
    124124}
    125125
    126 void MFParticleId::StreamPrimitive(ofstream &out) const
     126void MFParticleId::StreamPrimitive(ostream &out) const
    127127{
    128128    if (fMcEvt)

  • trunk/MagicSoft/Mars/mfilter/MFParticleId.h

    r2206 r7804  
    3030              const char *name, const char *title);
    3131
    32     void StreamPrimitive(ofstream &out) const;
     32    void StreamPrimitive(ostream &out) const;
    3333
    3434    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc

    r2206 r7804  
    119119}
    120120
    121 void MFTriggerLvl1::StreamPrimitive(ofstream &out) const
     121void MFTriggerLvl1::StreamPrimitive(ostream &out) const
    122122{
    123123    if (fMcTrig)

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.h

    r2206 r7804  
    3030              const char *name, const char *title);
    3131
    32     void StreamPrimitive(ofstream &out) const;
     32    void StreamPrimitive(ostream &out) const;
    3333
    3434    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl2.cc

    r2206 r7804  
    127127}
    128128
    129 void MFTriggerLvl2::StreamPrimitive(ofstream &out) const
     129void MFTriggerLvl2::StreamPrimitive(ostream &out) const
    130130{
    131131   if (fcell)

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl2.h

    r2206 r7804  
    3636              const char *name, const char *title);
    3737
    38     void StreamPrimitive(ofstream &out) const;
     38    void StreamPrimitive(ostream &out) const;
    3939
    4040    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

    r7360 r7804  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz     12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    19 !             Harald Kornmayer 01/2001
    20 !             Markus Gaug      03/2004 <mailto:markus@ifae.es>
     18!   Author(s): Thomas Bretz     12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!   Author(s): Harald Kornmayer 01/2001
     20!   Author(s): Markus Gaug      03/2004 <mailto:markus@ifae.es>
    2121!
    22 !   Copyright: MAGIC Software Development, 2000-2004
     22!   Copyright: MAGIC Software Development, 2000-2005
    2323!
    2424\* ======================================================================== */
    … …  
    135135void MGeomCam::InitOuterRing()
    136136{
    137     fPixels.ForEach(MGeomPix, CheckOuterRing)(*this);
     137    fPixels.R__FOR_EACH(MGeomPix, CheckOuterRing)(*this);
    138138}
    139139

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

    r7413 r7804  
    556556// gui elements to a macro-file.
    557557//
    558 void MBinning::StreamPrimitive(ofstream &out) const
     558void MBinning::StreamPrimitive(ostream &out) const
    559559{
    560560    out << "   MBinning " << GetUniqueName();

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

    r7413 r7804  
    2727    Byte_t  fType;
    2828
    29     void StreamPrimitive(ofstream &out) const;
     29    void StreamPrimitive(ostream &out) const;
    3030
    3131    enum {

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

    r7130 r7804  
    609609// gui elements to a macro-file.
    610610//
    611 void MFillH::StreamPrimitive(ofstream &out) const
     611void MFillH::StreamPrimitive(ostream &out) const
    612612{
    613613    if (fH)

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

    r7094 r7804  
    4545    void Init(const char *name, const char *title);
    4646
    47     void StreamPrimitive(ofstream &out) const;
     47    void StreamPrimitive(ostream &out) const;
    4848
    4949    Bool_t DrawToDisplay();

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

    r7731 r7804  
    630630// gui elements to a macro-file.
    631631//
    632 void MH3::StreamPrimitive(ofstream &out) const
     632void MH3::StreamPrimitive(ostream &out) const
    633633{
    634634    TString name = GetUniqueName();

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

    r7094 r7804  
    2626    Double_t    fScale[3];       // Scale for the three axis (eg unit)
    2727
    28     void StreamPrimitive(ofstream &out) const;
     28    void StreamPrimitive(ostream &out) const;
    2929
    3030    enum {

  • trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

    r7749 r7804  
    586586// gui elements to a macro-file.
    587587//
    588 void MHMatrix::StreamPrimitive(ofstream &out) const
     588void MHMatrix::StreamPrimitive(ostream &out) const
    589589{
    590590    Bool_t data = fData && !TestBit(kIsOwner);

  • trunk/MagicSoft/Mars/mhbase/MHMatrix.h

    r7749 r7804  
    6161    void GetRandomArrayI(TArrayI &ind) const;
    6262
    63     void StreamPrimitive(ofstream &out) const;
     63    void StreamPrimitive(ostream &out) const;
    6464
    6565public:

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

    r7384 r7804  
    396396
    397397  if (fHiGainArray)
    398     { fHiGainArray->ForEach(MHCalibrationPix,Reset)();  }
     398    { fHiGainArray->R__FOR_EACH(MHCalibrationPix,Reset)();  }
    399399
    400400  if (IsAverageing())
    401401    {
    402402      if (fAverageHiGainAreas)
    403         { fAverageHiGainAreas->ForEach(MHCalibrationPix,Reset)();  }
     403        { fAverageHiGainAreas->R__FOR_EACH(MHCalibrationPix,Reset)();  }
    404404      if (fAverageHiGainSectors)
    405         { fAverageHiGainSectors->ForEach(MHCalibrationPix,Reset)();  }
     405        { fAverageHiGainSectors->R__FOR_EACH(MHCalibrationPix,Reset)();  }
    406406    }
    407407
    … …  
    410410
    411411  if (fLoGainArray)
    412     { fLoGainArray->ForEach(MHCalibrationPix,Reset)();  }
     412    { fLoGainArray->R__FOR_EACH(MHCalibrationPix,Reset)();  }
    413413  if (IsAverageing())
    414414    {
    415415      if (fAverageLoGainAreas)
    416         { fAverageLoGainAreas->ForEach(MHCalibrationPix,Reset)();  }
     416        { fAverageLoGainAreas->R__FOR_EACH(MHCalibrationPix,Reset)();  }
    417417      if (fAverageLoGainSectors)
    418         { fAverageLoGainSectors->ForEach(MHCalibrationPix,Reset)();  }
     418        { fAverageLoGainSectors->R__FOR_EACH(MHCalibrationPix,Reset)();  }
    419419    }
    420420}

  • trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

    r7177 r7804  
    418418// gui elements to a macro-file.
    419419//
    420 void MHillasCalc::StreamPrimitive(ofstream &out) const
     420void MHillasCalc::StreamPrimitive(ostream &out) const
    421421{
    422422    out << "   MHillasCalc " << GetUniqueName() << "(";

  • trunk/MagicSoft/Mars/mimage/MHillasCalc.h

    r6910 r7804  
    6868
    6969    // MParContainer
    70     void StreamPrimitive(ofstream &out) const;
     70    void StreamPrimitive(ostream &out) const;
     71
    7172    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    7273

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

    r7611 r7804  
    808808// gui elements to a macro-file.
    809809//
    810 void MImgCleanStd::StreamPrimitive(ofstream &out) const
     810void MImgCleanStd::StreamPrimitive(ostream &out) const
    811811{
    812812    out << "   MImgCleanStd " << GetUniqueName() << "(";

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

    r7611 r7804  
    5858    // MGTask, MTask, MParContainer
    5959    void    CreateGuiElements(MGGroupFrame *f);
    60     void    StreamPrimitive(ofstream &out) const;
    6160    Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
     61
     62    void    StreamPrimitive(ostream &out) const;
    6263
    6364    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc

    r2781 r7804  
    432432// gui elements to a macro-file.
    433433//
    434 void MImgCleanTGB::StreamPrimitive(ofstream &out) const
     434void MImgCleanTGB::StreamPrimitive(ostream &out) const
    435435{
    436436    out << "   MImgCleanTGB " << GetUniqueName() << "(";

  • trunk/MagicSoft/Mars/mimage/MImgCleanTGB.h

    r2781 r7804  
    3838
    3939    void CreateGuiElements(MGGroupFrame *f);
    40     void StreamPrimitive(ofstream &out) const;
     40    void StreamPrimitive(ostream &out) const;
    4141
    4242    Int_t CleanStep3b(MCerPhotPix &pix);

  • trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

    r2497 r7804  
    462462    // Now you can display the results
    463463    //
    464     hists.ForEach(TObject, DrawClone)();
     464    hists.R__FOR_EACH(TObject, DrawClone)();
    465465}
    466466

  • trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc

    r7349 r7804  
    1717!
    1818!   Author(s): Thomas Bretz, 12/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
    19 !             Hendrik Bartko, 07/2003 <mailto:hbartko@mppmu.mpg.de>
     19!   Author(s): Hendrik Bartko, 07/2003 <mailto:hbartko@mppmu.mpg.de>
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2004
    … …  
    244244void MPedPhotCam::Clear(Option_t *o)
    245245{
    246     { fArray->ForEach(TObject, Clear)(); }
    247     { fAreas->ForEach(TObject, Clear)(); }
    248     { fSectors->ForEach(TObject, Clear)(); }
     246    { fArray->R__FOR_EACH(TObject, Clear)(); }
     247    { fAreas->R__FOR_EACH(TObject, Clear)(); }
     248    { fSectors->R__FOR_EACH(TObject, Clear)(); }
    249249}
    250250

  • trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc

    r7188 r7804  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz   12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    19 !             Markus Gaug    02/2004 <mailto:markus@ifae.es>
    20 !             Florian Goebel 06/2004 <mailto:fgoebel@mppmu.mpg.de>
     18!   Author(s): Thomas Bretz   12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!   Author(s): Markus Gaug    02/2004 <mailto:markus@ifae.es>
     20!   Author(s): Florian Goebel 06/2004 <mailto:fgoebel@mppmu.mpg.de>
    2121!
    2222!   Copyright: MAGIC Software Development, 2000-2004
    … …  
    269269void MPedestalCam::Clear(Option_t *o)
    270270{
    271     { fArray->ForEach(TObject, Clear)(); }
    272     { fAverageAreas->ForEach(TObject, Clear)(); }
    273     { fAverageSectors->ForEach(TObject, Clear)(); }
     271    { fArray->R__FOR_EACH(TObject, Clear)(); }
     272    { fAverageAreas->R__FOR_EACH(TObject, Clear)(); }
     273    { fAverageSectors->R__FOR_EACH(TObject, Clear)(); }
    274274 
    275275    fTotalEntries = 0;

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

    r7142 r7804  
    136136// gui elements to a macro-file.
    137137//
    138 void MSrcPosCam::StreamPrimitive(ofstream &out) const
     138void MSrcPosCam::StreamPrimitive(ostream &out) const
    139139{
    140140    out << "   MSrcPosCam " << GetUniqueName();
    … …  
    148148    out << ";" << endl;
    149149
    150     out << "   " << GetUniqueName() << ".SetXY(" << fX << ", " << fY << ");" << endl;}
     150    out << "   " << GetUniqueName() << ".SetXY(" << fX << ", " << fY << ");" << endl;
     151}

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

    r7142 r7804  
    3131    TVector2 GetXY() const;
    3232
     33    void Print(Option_t *opt=NULL) const;
    3334
    34     void Print(Option_t *opt=NULL) const;
    35     void StreamPrimitive(ofstream &out) const;
     35    void StreamPrimitive(ostream &out) const;
    3636
    3737    //void AsciiRead(ifstream &fin);

  • trunk/MagicSoft/Mars/mranforest/MRanTree.cc

    r7730 r7804  
    3434#include <iostream>
    3535
    36 #include <TVector.h>
    37 #include <TMatrix.h>
    3836#include <TRandom.h>
    3937
    … …  
    691689}
    692690
    693 Double_t MRanTree::TreeHad(const TMatrixRow &event)
     691Double_t MRanTree::TreeHad(const TMatrixFRow_const &event)
    694692{
    695693    return TreeHad(event.GetPtr());

  • trunk/MagicSoft/Mars/mranforest/MRanTree.h

    r7697 r7804  
    1414#endif
    1515
    16 class TMatrix;
     16#ifndef ROOT_TVector
     17#include <TVector.h>
     18#endif
     19
     20#ifndef ROOT_TMatrix
     21#include <TMatrix.h>
     22#endif
     23
    1724class TMatrixRow;
    18 class TVector;
    1925class TRandom;
    2026
    … …  
    103109
    104110    Double_t TreeHad(const TVector &event);
    105     Double_t TreeHad(const TMatrixRow &event);
     111    Double_t TreeHad(const TMatrixFRow_const &event);
    106112    Double_t TreeHad(const TMatrix &m, Int_t ievt);
    107113

  • trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

    r7639 r7804  
    154154            return kFALSE;
    155155
    156     fList->ForEach(MReportHelp, AddToList)(*pList);
     156    fList->R__FOR_EACH(MReportHelp, AddToList)(*pList);
    157157
    158158    //

  • trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc

    r7803 r7804  
    7272void MArrivalTimeCam::SetLogStream(MLog *lg)
    7373{
    74     fArray->ForEach(MParContainer, SetLogStream)(lg);
     74    fArray->R__FOR_EACH(MParContainer, SetLogStream)(lg);
    7575    MParContainer::SetLogStream(lg);
    7676}
    … …  
    114114void MArrivalTimeCam::Clear(Option_t *o)
    115115{
    116     fArray->ForEach(TObject, Clear)();
     116    fArray->R__FOR_EACH(TObject, Clear)();
    117117}
    118118

  • trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

    r7126 r7804  
    290290// gui elements to a macro-file.
    291291//
    292 void MExtractFixedWindow::StreamPrimitive(ofstream &out) const
     292void MExtractFixedWindow::StreamPrimitive(ostream &out) const
    293293{
    294294

  • trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h

    r4896 r7804  
    2424  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const;
    2525  void   FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const;
    26   void   StreamPrimitive(ofstream &out) const;
    27  
     26
     27  void   StreamPrimitive(ostream &out) const;
     28
    2829  Bool_t ReInit(MParList *pList);
    2930 

  • trunk/MagicSoft/Mars/msignal/MExtractSignal.cc

    r3764 r7804  
    194194// gui elements to a macro-file.
    195195//
    196 void MExtractSignal::StreamPrimitive(ofstream &out) const
     196void MExtractSignal::StreamPrimitive(ostream &out) const
    197197{
    198198    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";

  • trunk/MagicSoft/Mars/msignal/MExtractSignal.h

    r3306 r7804  
    4949    Int_t  PreProcess(MParList *pList);
    5050    Int_t  Process();
    51     void   StreamPrimitive(ofstream &out) const;
     51
     52    void   StreamPrimitive(ostream &out) const;
    5253
    5354public:

  • trunk/MagicSoft/Mars/msignal/MExtractSignalABcorr.cc

    r4404 r7804  
    214214// gui elements to a macro-file.
    215215//
    216 void MExtractSignalABcorr::StreamPrimitive(ofstream &out) const
     216void MExtractSignalABcorr::StreamPrimitive(ostream &out) const
    217217{
    218218    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";

  • trunk/MagicSoft/Mars/msignal/MExtractSignalABcorr.h

    r4404 r7804  
    4949    Int_t  PreProcess(MParList *pList);
    5050    Int_t  Process();
    51     void   StreamPrimitive(ofstream &out) const;
     51
     52    void   StreamPrimitive(ostream &out) const;
    5253
    5354public:

  • trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.cc

    r5740 r7804  
    7474void MExtractedSignalCam::SetLogStream(MLog *lg)
    7575{
    76     fArray->ForEach(MParContainer, SetLogStream)(lg);
     76    fArray->R__FOR_EACH(MParContainer, SetLogStream)(lg);
    7777    MParContainer::SetLogStream(lg);
    7878}
    … …  
    116116Float_t MExtractedSignalCam::GetProb( const Int_t pixidx )   const
    117117{
    118 
    119118  if (pixidx > GetSize()-1)
    120119    return -1.;
    … …  
    125124void MExtractedSignalCam::Clear(Option_t *o)
    126125{
    127     fArray->ForEach(TObject, Clear)();
     126    fArray->R__FOR_EACH(TObject, Clear)();
    128127}
    129128

  • trunk/MagicSoft/Mars/msignal/MExtractor.cc

    r7122 r7804  
    341341// gui elements to a macro-file.
    342342//
    343 void MExtractor::StreamPrimitive(ofstream &out) const
     343void MExtractor::StreamPrimitive(ostream &out) const
    344344{
    345345  out << "   " << ClassName() << " " << GetUniqueName() << "(\"";

  • trunk/MagicSoft/Mars/msignal/MExtractor.h

    r7091 r7804  
    7474  Bool_t  ReInit    ( MParList *pList );
    7575  Int_t   Process   ();
    76   void    StreamPrimitive(ofstream &out) const;
     76  void    StreamPrimitive(ostream &out) const;
    7777  Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    7878

  • trunk/MagicSoft/Mars/msignal/MSignalCam.cc

    r7364 r7804  
    104104    fNumPixelsSaturatedLoGain = -1;
    105105
    106     fPixels->ForEach(TObject, Clear)();
     106    fPixels->R__FOR_EACH(TObject, Clear)();
    107107}
    108108/*

  • trunk/MagicSoft/Mars/msignal/Makefile

    r7099 r7804  
    3939           MExtractFixedWindowSpline.cc \
    4040           MExtractAmplitudeSpline.cc \
    41            MExtractSignal.cc \
    42            MExtractSignal2.cc \
    43            MExtractSignal3.cc \
    44            MExtractSignalABcorr.cc \
    4541           MExtractPINDiode.cc \
    4642           MExtractBlindPixel.cc \
    … …  
    6056           MArrivalTimePix.cc
    6157
     58#           MExtractSignal.cc \
     59#           MExtractSignal2.cc \
     60#           MExtractSignal3.cc \
     61#           MExtractSignalABcorr.cc \
     62
    6263############################################################
    6364

  • trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

    r6856 r7804  
    1010#pragma link C++ class MExtractedSignalBlindPixel+;
    1111
    12 #pragma link C++ class MExtractSignal+;
    13 #pragma link C++ class MExtractSignal2+;
    14 #pragma link C++ class MExtractSignal3+;
    15 #pragma link C++ class MExtractSignalABcorr+;
     12//#pragma link C++ class MExtractSignal+;
     13//#pragma link C++ class MExtractSignal2+;
     14//#pragma link C++ class MExtractSignal3+;
     15//#pragma link C++ class MExtractSignalABcorr+;
    1616
    1717#pragma link C++ class MExtractor+;

  • trunk/MagicSoft/Mars/mtools/MChisqEval.cc

    r7152 r7804  
    154154}
    155155
    156 void MChisqEval::StreamPrimitive(ofstream &out) const
     156void MChisqEval::StreamPrimitive(ostream &out) const
    157157{
    158158    out << "   MChisqEval " << GetUniqueName() << ";";

  • trunk/MagicSoft/Mars/mtools/MChisqEval.h

    r7152 r7804  
    2323    TString fNameResult;
    2424
    25     void StreamPrimitive(ofstream &out) const;
     25    void StreamPrimitive(ostream &out) const;
    2626
    2727    enum { kIsOwner = BIT(14) };
Note: See TracChangeset for help on using the changeset viewer.