Changeset 7808


Ignore:
Timestamp:
Jul 26, 2006, 4:01:52 PM (14 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7806 r7808  
    4545   * mbase/MContinue.h:
    4646     - some reformatting
     47
     48   * mreport/MReportStarguider.h:
     49     - added enum for states
     50     - added IsMonitoring member function
     51
     52   * msignal/MArrivalTimeCam.cc:
     53     - fixed a problem which gave errors when compiling (introduced
     54       with the latest change)
    4755
    4856   * manalysis/MEventRateCalc.[h,cc], manalysis/MGeomApply.[h,cc],
     
    101109     - removed MExtractSignalABcorr
    102110
     111   * mbase/MArgs.cc, mbase/MContinue.cc, mbase/MEnv.cc, mbase/MGMap.[h,cc],
     112     mbase/MGTask.h, mbase/MLogManip.h, mbase/MLogPlugin.h
     113     mbase/MParContainer.cc, mbase/MParList.cc, mbase/MParameters.cc,
     114     mbase/MSearch.cc, mbase/MStatusArray.h, mbase/MTask.cc,
     115     mbase/MTaskList.[h,cc]:
     116     - removed some unused parameters from function declaration
     117
     118   * mbase/MArray.h, mbase/MArrayB.h, mbase/MArrayD.h, mbase/MArrayF.h,
     119     mbase/MArrayI.h, mbase/MArrayS.h, mbase/MDirIter.h, mbase/MLog.[h,cc],
     120     mbase/MReadSocket.h, mbase/MTask.cc, mbase/MTaskList.[h,cc],
     121     mbase/MTime.h:
     122     - added explicit initialization of base class to copy ctor
     123
     124   * mbase/MDirIter.[h,cc], mbase/MLog.[h,cc], mbase/MRunIter.cc,
     125     mbase/MZlib.cc:
     126     - fixed some warnings about local overwrites of variable names
     127
     128   * mbase/MTaskList.[h,cc]:
     129     - removed unsused second argument from CheckAddListTo
     130     - allow 0 as the type argument which just keeps the input steam id
     131       of the task
    103132
    104133
  • trunk/MagicSoft/Mars/mbase/MArgs.cc

    r7169 r7808  
    4646using namespace std;
    4747
    48 void MArgsEntry::Print(const Option_t *o) const
     48void MArgsEntry::Print(const Option_t *) const
    4949{
    5050    gLog << all << *this << endl;
  • trunk/MagicSoft/Mars/mbase/MArray.h

    r4955 r7808  
    2222   MArray()                              { fN = 0; }
    2323   MArray(UInt_t n)                      { fN = n; }
    24    MArray(const MArray &a)               { fN = a.fN; }
     24   MArray(const MArray &a) : TObject()   { fN = a.fN; }
    2525   virtual ~MArray()                     { fN = 0; }
    2626
  • trunk/MagicSoft/Mars/mbase/MArrayB.h

    r4915 r7808  
    4646    }
    4747
    48     MArrayB(const MArrayB &array)
     48    MArrayB(const MArrayB &array) : MArray()
    4949    {
    5050        // Copy constructor.
  • trunk/MagicSoft/Mars/mbase/MArrayD.h

    r5088 r7808  
    3737    }
    3838
    39     MArrayD(const MArrayD &array)
     39    MArrayD(const MArrayD &array) : MArray()
    4040    {
    4141        // Copy constructor.
  • trunk/MagicSoft/Mars/mbase/MArrayF.h

    r5298 r7808  
    3737    }
    3838
    39     MArrayF(const MArrayF &array)
     39    MArrayF(const MArrayF &array) : MArray()
    4040    {
    4141        // Copy constructor.
  • trunk/MagicSoft/Mars/mbase/MArrayI.h

    r5088 r7808  
    3636    }
    3737
    38     MArrayI(const MArrayI &array)
     38    MArrayI(const MArrayI &array) : MArray()
    3939    {
    4040        // Copy constructor.
  • trunk/MagicSoft/Mars/mbase/MArrayS.h

    r4916 r7808  
    4444    }
    4545
    46     MArrayS(const MArrayS &array)
     46    MArrayS(const MArrayS &array) : MArray()
    4747    {
    4848        // Copy constructor.
  • trunk/MagicSoft/Mars/mbase/MContinue.cc

    r7772 r7808  
    231231}
    232232
    233 void MContinue::Print(Option_t *o) const
     233void MContinue::Print(Option_t *) const
    234234{
    235235    *fLog << all << GetDescriptor() << ":";
  • trunk/MagicSoft/Mars/mbase/MDirIter.cc

    r7438 r7808  
    133133
    134134    // Create an iterator to iterate over all entries in the directory
    135     MDirIter Next(dir);
     135    MDirIter NextD(dir);
    136136
    137137    TString c;
    138     while (!(c=Next(kTRUE)).IsNull())
     138    while (!(c=NextD(kTRUE)).IsNull())
    139139    {
    140140        // Do not process . and .. entries
     
    155155void MDirIter::Add(const MDirIter &iter)
    156156{
    157     TIter Next(&iter.fList);
     157    TIter NextD(&iter.fList);
    158158    TObject *o=0;
    159     while ((o=Next()))
     159    while ((o=NextD()))
    160160        fList.Add(o->Clone());
    161161}
     
    347347// matching entries are printed.
    348348//
    349 void MDirIter::Print(const Option_t *o) const
    350 {
    351     TString s(o);
     349void MDirIter::Print(const Option_t *opt) const
     350{
     351    TString s(opt);
    352352    if (s.Contains("dbg", TString::kIgnoreCase))
    353353        fList.Print();
     
    355355    if (!s.Contains("all", TString::kIgnoreCase))
    356356    {
    357         TIter Next(&fList);
     357        TIter NextD(&fList);
    358358        TObject *o=NULL;
    359         while ((o=Next()))
     359        while ((o=NextD()))
    360360            PrintEntry(*o);
    361361        return;
    362362    }
    363363
    364     MDirIter Next(*this);
     364    MDirIter NextD(*this);
    365365    TString name;
    366366    TString d;
    367     while (!(name=Next()).IsNull())
     367    while (!(name=NextD()).IsNull())
    368368    {
    369         const TString p = Next.fCurrentPath->GetName();
     369        const TString p = NextD.fCurrentPath->GetName();
    370370        if (p!=d)
    371371        {
    372372            d=p;
    373             PrintEntry(*Next.fCurrentPath);
     373            PrintEntry(*NextD.fCurrentPath);
    374374        }
    375375        cout << " " << name << endl;
     
    385385void MDirIter::Sort()
    386386{
    387     MDirIter Next(*this);
     387    MDirIter NextD(*this);
    388388
    389389    TList l;
     
    391391
    392392    TString name;
    393     while (!(name=Next()).IsNull())
     393    while (!(name=NextD()).IsNull())
    394394        l.Add(new TNamed(name.Data(), ""));
    395395
     
    404404    while ((o=NextN()))
    405405    {
    406         TString dir  = o->GetName();
    407         TString name = o->GetName();
     406        TString dir   = o->GetName();
     407        TString fname = o->GetName();
    408408
    409409        const Int_t last = dir.Last('/');
     
    412412
    413413        dir.Remove(last);
    414         name.Remove(0, last+1);
    415 
    416         AddDirectory(dir, name);
     414        fname.Remove(0, last+1);
     415
     416        AddDirectory(dir, fname);
    417417    }
    418418}
  • trunk/MagicSoft/Mars/mbase/MDirIter.h

    r5307 r7808  
    3030        fList.SetOwner();
    3131    }
    32     MDirIter(const MDirIter &dir) : fNext(&fList), fDirPtr(NULL)
     32    MDirIter(const MDirIter &dir) : TObject(), fNext(&fList), fDirPtr(NULL)
    3333    {
    3434        fList.SetOwner();
    3535
    3636        TObject *o=NULL;
    37         TIter Next(&dir.fList);
    38         while ((o=Next()))
     37        TIter NextD(&dir.fList);
     38        while ((o=NextD()))
    3939            AddDirectory(o->GetName(), o->GetTitle());
    4040    }
     
    6262    {
    6363        UInt_t n = 0;
    64         MDirIter Next(*this);
    65         while (!Next().IsNull()) n++;
     64        MDirIter NextD(*this);
     65        while (!NextD().IsNull()) n++;
    6666        return n;
    6767    }
  • trunk/MagicSoft/Mars/mbase/MEnv.cc

    r7749 r7808  
    101101//   --> we have to clone it ourself
    102102//
    103 TObject *MEnv::Clone(const char *newname) const
     103TObject *MEnv::Clone(const char *) const
    104104{
    105105    MEnv *env = new MEnv("/dev/null");
  • trunk/MagicSoft/Mars/mbase/MGMap.cc

    r7789 r7808  
    154154// Delete all objects stored in the TExMap
    155155//
    156 void MGMap::Delete(Option_t *opt)
     156void MGMap::Delete(Option_t *)
    157157{
    158158    Long_t key, val;
     
    420420// Paint all elements to the pad by calling their Paint() function
    421421//
    422 void MGMap::Paint(Option_t *o)
     422void MGMap::Paint(Option_t *)
    423423{
    424424    Long_t key, val;
  • trunk/MagicSoft/Mars/mbase/MGMap.h

    r7789 r7808  
    3232    void     SetOwner(Bool_t o=kTRUE) { o ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
    3333    void     Add(TObject *k, TString *v=0);
    34     void     Delete(Option_t *opt = "");
    35     void     Clear(Option_t *o="") { TExMap::Delete(); }
     34    void     Delete(Option_t *opt="");
     35    void     Clear(Option_t *o="") { TExMap::Delete(o); }
    3636
    3737    //    void   SetNoToolTips(Bool_t b=kTRUE) { b ? SetBit(kNoToolTips) : ResetBit(kNoToolTips); } // *TOGGLE* *GETTER=HasNoToolTips
  • trunk/MagicSoft/Mars/mbase/MGTask.h

    r2206 r7808  
    2626    MGGroupFrame *fFrame;     //!
    2727
    28     virtual void CreateGuiElements(MGGroupFrame *f) {}
     28    virtual void CreateGuiElements(MGGroupFrame *) {}
    2929
    3030    void ShowGui();
  • trunk/MagicSoft/Mars/mbase/MLog.cc

    r7804 r7808  
    183183// ofstream as the default output device
    184184//
    185 MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&out), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
     185MLog::MLog(ofstream &sout) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&sout), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
    186186{
    187187    Init();
     
    193193// TGTextView as the default output device
    194194//
    195 MLog::MLog(TGTextView &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&out), fNumLines(0)
     195MLog::MLog(TGTextView &sout) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&sout), fNumLines(0)
    196196{
    197197    Init();
     
    276276}
    277277
    278 void MLog::Output(ostream &out, int len)
     278void MLog::Output(ostream &sout, int len)
    279279{
    280280    if (!TestBit(eNoColors))
     
    284284            // case 1: out << MLog::kReset; break; // all
    285285        case 0:  break; // all = background color
    286         case 1:  out << MLog::kRed;     break;  // err
    287         case 2:  out << MLog::kYellow;  break;  // warn
    288         case 3:  out << MLog::kGreen;   break;  // inf
    289         default: out << MLog::kBlue;    break;  // all others (dbg)
     286        case 1:  sout << MLog::kRed;     break;  // err
     287        case 2:  sout << MLog::kYellow;  break;  // warn
     288        case 3:  sout << MLog::kGreen;   break;  // inf
     289        default: sout << MLog::kBlue;    break;  // all others (dbg)
    290290        }
    291291
     
    295295        const Int_t endline = fBase[len-1]=='\n' ? 1 : 0;
    296296        // output text to screen (without trailing '\n')
    297         out << TString(fBase, len-endline);
     297        sout << TString(fBase, len-endline);
    298298        // reset colors if working with colors
    299299        if (!TestBit(eNoColors))
    300             out << kReset;
     300            sout << kReset;
    301301        // output EOL of check found EOL
    302302        if (endline)
    303303        {
    304             out << '\n';
     304            sout << '\n';
    305305            // Check whether text was underlined
    306306            if (TestBit(kIsUnderlined) && TestBit(eNoColors))
    307307            {
    308                 out << setw(len-1) << setfill('-') << "" << "\n";
     308                sout << setw(len-1) << setfill('-') << "" << "\n";
    309309                ResetBit(kIsUnderlined);
    310310            }
    311311        }
    312312    }
    313     out.flush();
     313    sout.flush();
    314314}
    315315
     
    638638//   Job1.MLog.NoColors
    639639//
    640 void MLog::WriteEnv(TEnv &env, TString prefix, Bool_t print) const
     640void MLog::WriteEnv(TEnv &, TString prefix, Bool_t) const
    641641{
    642642    if (!prefix.IsNull())
  • trunk/MagicSoft/Mars/mbase/MLog.h

    r7438 r7808  
    88#include <TString.h>
    99#endif
    10 
     10#ifndef ROOT_TSystem
    1111#include <TSystem.h>
     12#endif
    1213
    1314#include <iostream>  // base classes for MLog
    14 
    1515
    1616class MArgs;
     
    101101    MLog(const char *fname, int flag=-1);
    102102
    103     MLog(MLog const& log) : ostream((std::streambuf*)&log)
     103    MLog(MLog const& log) : std::ios(), std::streambuf(), ostream((std::streambuf*)&log), TObject()
    104104    {
    105105        fOutputLevel = log.fOutputLevel;
     
    121121    void Underline();
    122122
    123     void SetDebugLevel(int i)           { fDebugLevel  =  i;  }
    124     int  GetDebugLevel() const          { return fDebugLevel; }
    125     void SetOutputLevel(int i)          { fOutputLevel =  i;  }
    126     void SetOutputDevice(int i)         { fDevice      =  i;  }
    127     void EnableOutputDevice(Flags_t f)  { fDevice     |=  f;  }
    128     void DisableOutputDevice(Flags_t f) { fDevice     &= ~f;  }
    129     void operator=(ofstream &out)       { SetOutputFile(out); }
    130     void operator=(TGTextView *out)     { SetOutputGui(out);  }
     123    void SetDebugLevel(int i)           { fDebugLevel  =  i;   }
     124    int  GetDebugLevel() const          { return fDebugLevel;  }
     125    void SetOutputLevel(int i)          { fOutputLevel =  i;   }
     126    void SetOutputDevice(int i)         { fDevice      =  i;   }
     127    void EnableOutputDevice(Flags_t f)  { fDevice     |=  f;   }
     128    void DisableOutputDevice(Flags_t f) { fDevice     &= ~f;   }
     129    void operator=(ofstream &sout)      { SetOutputFile(sout); }
     130    void operator=(TGTextView *sout)    { SetOutputGui(sout);  }
    131131
    132132    Bool_t IsNullOutput() const { return fIsNull; }
    133133    Bool_t IsOutputDeviceEnabled(int i) const { return fDevice & i; }
    134134
    135     void SetOutputGui(TGTextView *out, int flag=-1)
    136     {
    137         fGui = out;
     135    void SetOutputGui(TGTextView *sout, int flag=-1)
     136    {
     137        fGui = sout;
    138138        CheckFlag(eGui, flag);
    139139    }
    140140
    141     void SetOutputFile(ofstream &out, int flag=-1)
     141    void SetOutputFile(ofstream &sout, int flag=-1)
    142142    {
    143143        //
     
    149149        //
    150150        DeallocateFile();
    151         fOut = &out;
     151        fOut = &sout;
    152152        CheckFlag(eFile, flag);
    153153    }
  • trunk/MagicSoft/Mars/mbase/MLogManip.h

    r2193 r7808  
    1212};
    1313
    14 inline std::ostream &operator<<(std::ostream &lout, MLogManip u)
     14inline std::ostream &operator<<(std::ostream &lout, MLogManip)
    1515{
    1616    MLog *log=dynamic_cast<MLog*>(lout.rdbuf());
  • trunk/MagicSoft/Mars/mbase/MLogPlugin.h

    r2784 r7808  
    99{
    1010public:
    11     virtual void SetColor(int col) { }
     11    virtual void SetColor(int) { }
    1212    virtual void Underline() { }
    1313    virtual void WriteBuffer(const char *str, int len) = 0;
  • trunk/MagicSoft/Mars/mbase/MParContainer.cc

    r7804 r7808  
    9898//  MParContainer copy ctor
    9999//
    100 MParContainer::MParContainer(const MParContainer &named)
     100MParContainer::MParContainer(const MParContainer &named) : TObject()
    101101{
    102102    fName  = named.fName;
     
    333333//  container, overload this function.
    334334//
    335 void MParContainer::AsciiRead(istream &fin)
     335void MParContainer::AsciiRead(istream &)
    336336{
    337337    *fLog << warn << "To use the the ascii input of " << GetName();
     
    682682// gui elements to a macro-file.
    683683//
    684 void MParContainer::SavePrimitive(ostream &out, Option_t *o)
     684void MParContainer::SavePrimitive(ostream &out, Option_t *)
    685685{
    686686    static UInt_t uid = 0;
     
    698698}
    699699
    700 void MParContainer::SavePrimitive(ofstream &out, Option_t *o)
     700void MParContainer::SavePrimitive(ofstream &out, Option_t *)
    701701{
    702702    SavePrimitive(static_cast<ostream&>(out));
  • trunk/MagicSoft/Mars/mbase/MParList.cc

    r7804 r7808  
    100100//  entries)
    101101//
    102 MParList::MParList(const MParList &ts, const char *name, const char *title)
     102MParList::MParList(const MParList &ts, const char *name, const char *title) : MParContainer()
    103103{
    104104    Init(name, title);
     
    636636//   print some information about the current status of MParList
    637637//
    638 void MParList::Print(Option_t *t) const
     638void MParList::Print(Option_t *) const
    639639{
    640640    *fLog << all << underline << GetDescriptor() << ":" << endl;
     
    777777//  compiled programs if you are not 100% sure what you are doing.
    778778//
    779 TObjArray MParList::CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname)
     779TObjArray MParList::CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *)
    780780{
    781781    TObjArray list;
     
    841841}
    842842
    843 void MParList::SavePrimitive(ostream &out, Option_t *o)
     843void MParList::SavePrimitive(ostream &out, Option_t *)
    844844{
    845845    Bool_t saved = IsSavedAsPrimitive();
  • trunk/MagicSoft/Mars/mbase/MParameters.cc

    r6915 r7808  
    8181}
    8282
    83 void MParameterD::Print(Option_t *o) const
     83void MParameterD::Print(Option_t *) const
    8484{
    8585    *fLog << all << GetDescriptor() << ":  Val=" << fVal << endl;
    8686}
    8787
    88 void MParameterDerr::Print(Option_t *o) const
     88void MParameterDerr::Print(Option_t *) const
    8989{
    9090    *fLog << all << GetDescriptor() << ":  Val=" << GetVal() << "  Err=" << fErr << endl;
    9191}
    9292
    93 void MParameterI::Print(Option_t *o) const
     93void MParameterI::Print(Option_t *) const
    9494{
    9595    *fLog << all << GetDescriptor() << ":  Val=" << fVal << endl;
  • trunk/MagicSoft/Mars/mbase/MReadSocket.h

    r2490 r7808  
    3434public:
    3535    MReadSocket(int port=-1, int mtu=1500);
    36     MReadSocket(MReadSocket const& log) : istream((std::streambuf*)&log)
     36    MReadSocket(MReadSocket const& log) : std::ios(), std::streambuf(), istream((std::streambuf*)&log)
    3737    {
    3838    }
  • trunk/MagicSoft/Mars/mbase/MRunIter.cc

    r5461 r7808  
    6464      fmt = run>35487 ? "*_%08d_*_%s" : "*_%05d_*_%s";
    6565
    66     MDirIter Next;
    67     Next.AddDirectory(p, Form(fmt, run,fIsRawFile?"*.raw":"*.root"), -1);
     66    MDirIter NextR;
     67    NextR.AddDirectory(p, Form(fmt, run,fIsRawFile?"*.raw":"*.root"), -1);
    6868
    69     const TString name(Next());
     69    const TString name(NextR());
    7070    if (name.IsNull())
    7171        return 0;
  • trunk/MagicSoft/Mars/mbase/MSearch.cc

    r2494 r7808  
    185185//  Process messages from the widgets.
    186186//
    187 Bool_t MSearch::ProcessMessage(Long_t msg, Long_t mp1, Long_t mp2)
     187Bool_t MSearch::ProcessMessage(Long_t msg, Long_t mp1, Long_t /*mp2*/)
    188188{
    189189    // Can be found in WidgetMessageTypes.h
  • trunk/MagicSoft/Mars/mbase/MStatusArray.h

    r6979 r7808  
    3131
    3232    void Print(Option_t *o="") const;
    33     void Print(Option_t *wildcard, Option_t *option) const
     33    void Print(Option_t *wildcard, Option_t *) const
    3434    {
    3535        Print(wildcard);
     
    3838    TObject *FindObject(const char *object, const char *base) const;
    3939    TObject *FindObject(const char *object) const;
    40     TObject *FindObject(const TObject *o) const { return 0; }
     40    TObject *FindObject(const TObject *) const { return 0; }
    4141
    4242    Int_t Read(const char *name=NULL);
  • trunk/MagicSoft/Mars/mbase/MTask.cc

    r7804 r7808  
    196196// Copy constructor.
    197197//
    198 MTask::MTask(MTask &t)
     198MTask::MTask(MTask &t) : MInputStreamID()
    199199{
    200200    fFilter = t.fFilter;
     
    305305// the virtual implementation returns kTRUE
    306306//
    307 Bool_t MTask::ReInit(MParList *pList)
     307Bool_t MTask::ReInit(MParList *)
    308308{
    309309    return kTRUE;
     
    319319// the virtual implementation returns kTRUE
    320320//
    321 Int_t MTask::PreProcess(MParList *pList)
     321Int_t MTask::PreProcess(MParList *)
    322322{
    323323    return kTRUE;
     
    455455// and afterwards set the filter for this task.
    456456//
    457 void MTask::SavePrimitive(ostream &out, Option_t *o)
     457void MTask::SavePrimitive(ostream &out, Option_t *)
    458458{
    459459    MParContainer::SavePrimitive(out);
  • trunk/MagicSoft/Mars/mbase/MTaskList.cc

    r7804 r7808  
    108108//   TaskList in the new TaskList.
    109109//
    110 MTaskList::MTaskList(MTaskList &ts)
     110MTaskList::MTaskList(MTaskList &ts) : MTask()
    111111{
    112112    fTasks->AddAll(ts.fTasks);
     
    175175}
    176176
    177 Bool_t MTaskList::CheckAddToList(MTask *task, const char *type, const MTask *where) const
     177Bool_t MTaskList::CheckAddToList(MTask *task, /*const char *type,*/ const MTask *where) const
    178178{
    179179    //
     
    244244
    245245    // FIXME: We agreed to put the task into list in an ordered way.
    246     if (!CheckAddToList(task, type, where))
     246    if (!CheckAddToList(task, /*type,*/ where))
    247247        return kFALSE;
    248248
    249     *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
    250     task->SetStreamId(type);
     249    const TString stream = type ? (TString)type : task->GetStreamId();
     250
     251    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush;
     252    task->SetStreamId(stream);
    251253    task->SetBit(kMustCleanup);
    252254    fTasks->AddBefore((TObject*)where, task);
     
    272274
    273275    // FIXME: We agreed to put the task into list in an ordered way.
    274     if (!CheckAddToList(task, type, where))
     276    if (!CheckAddToList(task, /*type,*/ where))
    275277        return kFALSE;
    276278
    277     *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
    278     task->SetStreamId(type);
     279    const TString stream = type ? (TString)type : task->GetStreamId();
     280
     281    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush;
     282    task->SetStreamId(stream);
    279283    task->SetBit(kMustCleanup);
    280284    fTasks->AddAfter((TObject*)where, task);
     
    300304
    301305    // FIXME: We agreed to put the task into list in an ordered way.
    302     if (!CheckAddToList(task, type))
     306    if (!CheckAddToList(task/*, type*/))
    303307        return kFALSE;
    304308
    305     *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
    306     task->SetStreamId(type);
     309    const TString stream = type ? (TString)type : task->GetStreamId();
     310
     311    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush;
     312    task->SetStreamId(stream);
    307313    task->SetBit(kMustCleanup);
    308314    fTasks->Add(task);
     
    812818// Call 'Print()' of all tasks
    813819//
    814 void MTaskList::Print(Option_t *t) const
     820void MTaskList::Print(Option_t *) const
    815821{
    816822    *fLog << all << underline << GetDescriptor() << ":" << endl;
     
    10201026        return kTRUE;
    10211027
    1022     *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << obj->GetStreamId() << "... " << flush;
     1028    *fLog << inf << "Replacing " << task->GetName() << " in " << GetName() << " for " << obj->GetStreamId() << "... " << flush;
    10231029    task->SetStreamId(obj->GetStreamId());
    10241030    task->SetBit(kMustCleanup);
  • trunk/MagicSoft/Mars/mbase/MTaskList.h

    r7804 r7808  
    3232    void   Remove(MTask *task);
    3333    void   StreamPrimitive(ostream &out) const;
    34     Bool_t CheckAddToList(MTask *task, const char *tType, const MTask *where=NULL) const;
     34    Bool_t CheckAddToList(MTask *task, /*const char *tType,*/ const MTask *where=NULL) const;
    3535
    3636public:
  • trunk/MagicSoft/Mars/mbase/MTime.h

    r7458 r7808  
    6262    }
    6363    MTime(Double_t mjd);
    64     MTime(const MTime& t) : fMjd(t.fMjd), fTime(t.fTime), fNanoSec(t.fNanoSec)
     64    MTime(const MTime& t) : MParContainer(), fMjd(t.fMjd), fTime(t.fTime), fNanoSec(t.fNanoSec)
    6565    {
    6666        Init(NULL, NULL);
  • trunk/MagicSoft/Mars/mbase/MZlib.cc

    r7786 r7808  
    8181// pointers by calling setg
    8282//
    83 int MZlib::fill_buffer(int putback)
     83int MZlib::fill_buffer(int iputback)
    8484{
    8585    const int num = gzread(fFile, fBuffer+4, fgBufferSize-4);
     
    8888
    8989    // reset buffer pointers
    90     setg(fBuffer+(4-putback), fBuffer+4, fBuffer+4+num);
     90    setg(fBuffer+(4-iputback), fBuffer+4, fBuffer+4+num);
    9191
    9292    return num;
     
    106106
    107107    // gptr()-eback(): if more than four bytes are already flushed
    108     const int putback = gptr()-eback()>4 ? 4 : gptr()-eback();
     108    const int iputback = gptr()-eback()>4 ? 4 : gptr()-eback();
    109109
    110110    // Copy the last four bytes flushed into the putback area
    111     memcpy(fBuffer+(4-putback), gptr()-putback, putback);
     111    memcpy(fBuffer+(4-iputback), gptr()-iputback, iputback);
    112112
    113     if (fill_buffer(putback)==EOF)
     113    if (fill_buffer(iputback)==EOF)
    114114        return EOF;
    115115
  • trunk/MagicSoft/Mars/mjobs/MSequence.cc

    r7438 r7808  
    242242
    243243        TString n;
    244         char *id="_";
     244        const char *id="_";
    245245        switch (type)
    246246        {
Note: See TracChangeset for help on using the changeset viewer.