Changeset 1116 for trunk


Ignore:
Timestamp:
12/17/01 10:20:08 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/.rootrc

    r932 r1116  
    66#############################################################################
    77
    8 Unix.*.Root.MacroPath:   .:./macros
     8Unix.*.Root.MacroPath:       .:./macros
    99
    1010#############################################################################
    … …  
    1515#############################################################################
    1616
    17 Unix.*.Root.DynamicPath: .:./lib
     17Unix.*.Root.DynamicPath:     .:./lib
    1818
    1919#############################################################################
    … …  
    2424#############################################################################
    2525
    26 Rint.Logon:              rootlogon.C
    27 Rint.Logoff:             rootlogoff.C
     26Rint.Logon:                  rootlogon.C
     27Rint.Logoff:                 rootlogoff.C
    2828
    2929#############################################################################
    … …  
    3434#############################################################################
    3535
    36 Root.Html.Author:        !   Author(s):
    37 Root.Html.Copyright:     !   Copyright
    38 Root.Html.Modified:      !   Modified:
    39 Root.Html.Description    // ----
     36Root.Html.DescriptionStyle:  Doc++
    4037
    41 Root.Html.Root:          http://root.cern.ch/root/htmldoc/
    42 Root.Html.HomePage:      http://magic.uni-sw.gwdg.de/mars/
     38Root.Html.Author:            !   Author(s):
     39Root.Html.Copyright:         !   Copyright
     40Root.Html.Modified:          !   Modified:
     41Root.Html.Description        // ----
     42
     43Root.Html.Root:              http://root.cern.ch/root/htmldoc/
     44Root.Html.HomePage:          http://magic.uni-sw.gwdg.de/mars/
     45Root.Html.SearchEngine:      http://magic.uni-sw.gwdg.de/mars/search.html

  • trunk/MagicSoft/Mars/macros/dohtml.C

    r1077 r1116  
    3333    //   create the html document class
    3434    //
    35     MHtml html;
     35    THtml html;
    3636
    3737    html.SetOutputDir("htmldoc");
    3838    html.SetSourceDir(".:mbase:mraw:mgui:manalysis:mdatacheck:mmain:meventdisp:mmc:mmontecarlo:mhist:mfilter");
    39     html.SetXwho("http://hegra1.mppmu.mpg.de/MAGICWeb/collaborators.html?");
    4039
    4140    html.MakeAll(kTRUE);

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r1099 r1116  
    3737           MHillasCalc.cc \
    3838           MCerPhotCalc.cc \
     39           MCerPhotPix.cc \
    3940           MCerPhotEvt.cc \
    40            MCerPhotPix.cc \
    4141           MPedCalcPedRun.cc
    4242

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

    r1076 r1116  
    5353#pragma link C++ class MTime+;
    5454
    55 #pragma link C++ class MHtml+;
    56 
    57 
    5855#endif

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

    r1108 r1116  
    5050//  objects in the list.
    5151//
    52 #include <TRefCnt.h>
    53 
    5452MGList::~MGList()
    5553{
    … …  
    9189    //  -fno-rtti, which could be used in 'plain' C++
    9290    //
     91
     92    //
     93    // FIXME: This should not be necessary but it is, why??
     94    //
     95    // TRY: TGPicture *pic = gClient->GetPicture("pic");
     96    //      cout << pic->IsA()->DynamicCast(TGWidget::Class(), pic) << endl;
     97    //
     98    //      Is this another bug in root?
     99    //
     100    if (!obj->IsA()->InheritsFrom(TGWidget::Class()))
     101        return NULL;
     102
    93103    return (TGWidget*)obj->IsA()->DynamicCast(TGWidget::Class(), obj);
    94104}
    … …  
    137147    if (IsExisting(obj))
    138148    {
    139         cout << "Widget with id #" << GetWidget(obj)->WidgetId() << " already in list... ignored." << endl;
     149        const Int_t id = GetWidget(obj)->WidgetId();
     150        cout << "Widget with id #" << id << " (";
     151        cout << FindWidget(id)->ClassName() << ") already in list... ";
     152        cout << obj->GetName() << " ignored." << endl;
    140153        return;
    141154    }
    … …  
    155168    if (IsExisting(obj))
    156169    {
    157         cout << "Widget with id #" << GetWidget(obj)->WidgetId() << " already in list... ignored." << endl;
     170        Int_t id = GetWidget(obj)->WidgetId();
     171        cout << "Widget with id #" << id << " (";
     172        cout << FindWidget(id)->ClassName() << ") already in list... ";
     173        cout << obj->GetName() << " ignored." << endl;
    158174        return;
    159175    }

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

    r1114 r1116  
    259259
    260260    if (fChain->GetBranch(dot+1))
    261         SetBranchStatus(dot+1, kTRUE);
     261        SetBranchStatus(dot+1, status);
    262262}
    263263
    … …  
    294294    // check whether branch choosing must be switched on
    295295    //
    296     //EnableBranchChoosing();
     296    EnableBranchChoosing();
    297297
    298298    //
    … …  
    308308
    309309    //
    310     // Loop over all tasks iand its filters n the task list.
    311     //
     310    // This loop is not necessary. We could do it like in the commented
     311    // loop below. But this loop makes sure, that we don't try to enable
     312    // one branch several times. This would not harm, but we would get
     313    // an output for each attempt. To have several outputs for one subbranch
     314    // may confuse the user, this we don't want.
     315    // This loop creates a new list of subbranches and for each branch
     316    // which is added we check before whether it already exists or not.
     317    //
     318    TList list;
     319
    312320    MTask *task;
    313321    TIter NextTask(tlist->GetList());
    314322    while ((task=(MTask*)NextTask()))
    315323    {
     324        TObject *obj;
     325
     326        TIter NextTBranch(task->GetListOfBranches());
     327        while ((obj=NextTBranch()))
     328            if (!list.FindObject(obj->GetName()))
     329                list.Add(obj);
     330
     331        const MFilter *filter = task->GetFilter();
     332
     333        if (!filter)
     334            continue;
     335
     336        TIter NextFBranch(filter->GetListOfBranches());
     337        while ((obj=NextFBranch()))
     338            if (!list.FindObject(obj->GetName()))
     339                list.Add(obj);
     340    }
     341
     342    SetBranchStatus(&list, kTRUE);
     343/*
     344    //
     345    // Loop over all tasks iand its filters n the task list.
     346    //
     347    MTask *task;
     348    TIter NextTask(tlist->GetList());
     349    while ((task=(MTask*)NextTask()))
     350    {
    316351        SetBranchStatus(task->GetListOfBranches(), kTRUE);
     352
    317353        const MFilter *filter = task->GetFilter();
    318 
    319         if (filter)
    320             SetBranchStatus(filter->GetListOfBranches(), kTRUE);
    321 
    322     }
     354        if (!filter)
     355           continue;
     356
     357        SetBranchStatus(filter->GetListOfBranches(), kTRUE);
     358
     359    }
     360*/
    323361}
    324362
    … …  
    376414    *fLog << inf << fNumEntries << " entries found in file(s)." << endl;
    377415
    378     *fLog << all << fChain->GetListOfBranches() << endl;
    379 
    380416    //
    381417    // Get all branches of this tree and
    … …  
    386422
    387423    Int_t num=0;
    388 
    389 
    390     *fLog << "Start..." << endl;
    391424    //
    392425    // loop over all tasks for processing
    … …  
    399432        const char *bname = branch->GetName();
    400433
    401         *fLog << all << bname << endl;
    402 
    403434        TString oname(bname);
    404 
    405435        if (oname.EndsWith("."))
    406436            oname.Remove(oname.Length()-1);
    … …  
    412442        {
    413443            *fLog << inf << "Master branch " << bname << " has veto... skipped." << endl;
    414             DisableSubBranches(branch);
    415             continue;
    416         }
    417 
    418         MParContainer *obj = pList->FindCreateObj(oname);
    419 
    420         if (!obj)
    421         {
    422             //
    423             // if class is not existing in the (root) environment
    424             // we cannot proceed reading this branch
    425             //
    426             *fLog << warn << dbginf << "Warning: Class '" << oname << "' not existing in dictionary. Branch skipped." << endl;
    427444            DisableSubBranches(branch);
    428445            continue;
    … …  
    551568{
    552569    //
    553     // This is necessary due to a bug in TCHain::LoadTree in root.
     570    // This is necessary due to a bug in TChain::LoadTree in root.
     571    // will be fixed in 3.03
    554572    //
    555573    if (fNumEntry >= fNumEntries)
    … …  
    644662void MReadTree::VetoBranch(const char *name)
    645663{
    646     TNamed *branch = new TNamed(name, "");
    647     fVetoList->Add(branch);
     664    fVetoList->Add(new TNamed(name, ""));
    648665}
    649666

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

    r1114 r1116  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz <mailto:tbretz@uni-sw.gwdg.de>, 12/2000
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    113113void MTask::AddToBranchList(const char *b)
    114114{
    115     TNamed *name = new TNamed(b, "");
    116     fListOfBranches->Add(name);
     115    if (fListOfBranches->FindObject(b))
     116        return;
     117
     118    fListOfBranches->Add(new TNamed(b, ""));
    117119}
    118120

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

    r1108 r1116  
    4848ClassImp(MWriteRootFile);
    4949
    50 #define kFillTree BIT(14)
    51 
    5250// --------------------------------------------------------------------------
    5351//
    … …  
    315313void MWriteRootFile::CheckAndWrite() const
    316314{
     315    const Int_t kFillTree = BIT(14);
     316
    317317    TObject *obj;
    318318

  • trunk/MagicSoft/Mars/mbase/Makefile

    r1076 r1116  
    5151           MArrayS.cc \
    5252           MTime.cc \
    53            MHtml.cc \
    5453           MClone.cc \
    5554           MPrint.cc \

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

    r1108 r1116  
    6666    fValue = val;
    6767
    68     AddToBranchList("MMcTrig.fNumFirstLevel");
     68    AddToBranchList(Form("%s.fNumFirstLevel", (const char*)fContName));
    6969}
    7070
Note: See TracChangeset for help on using the changeset viewer.