Changeset 7418 for trunk/MagicSoft


Ignore:
Timestamp:
11/22/05 10:25:49 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7414 r7418  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2005/11/22 Thomas Bretz
     21
     22   * macros/train/traindisp.C:
     23     - added a comment
     24
     25   * mdata/MDataFormula.cc:
     26     - fixed along outstanding bug. Because TFormula had no name
     27       some axis tick marks disappeared randomly
     28     - fixed a typo (Add instead of Remove)
     29
     30   * mfbase/MFEventSelector.cc:
     31     - also reset fSelRatio if totalnumber of events from file.
     32
     33
     34
    2035 2005/11/21 Thomas Bretz
    2136

  • trunk/MagicSoft/Mars/NEWS

    r7414 r7418  
    22
    33 *** Version  <cvs>
     4
     5   - general: Fixed a long outstanding bug which made axis tick marks
     6     disappear if MDataFormula was used (eg. abs(x))
    47
    58   - general: Updated MMath with new functions to calculate the results of

  • trunk/MagicSoft/Mars/macros/train/traindisp.C

    r7413 r7418  
    6060     opt.AddPreCut("MHillasSrc.fDCA*MGeomCam.fConvMm2Deg<0.3");
    6161
     62     // The number is the number of events read from the file
     63     // randomly and is the number of events before cuts
    6264     opt.Train("rf-disp.root", set, 30000);
    6365}

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

    r6949 r7418  
    139139
    140140    fFormula = new TFormula;
     141
     142    //Must have a name otherwise all axis label disappear like a miracle
     143    fFormula->SetName(fName);
     144
    141145    if (fFormula->Compile(txt))
    142146    {
    … …  
    172176
    173177    fFormula = f ? (TFormula*)f->Clone() : 0;
    174     gROOT->GetListOfFunctions()->Add(fFormula);
     178    gROOT->GetListOfFunctions()->Remove(fFormula);
    175179
    176180    fMembers.SetOwner();

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

    r3330 r7418  
    169169    fResult = gRandom->Uniform() < fSelRatio;
    170170
    171     if (!fResult)
    172         return kTRUE;
    173 
    174     fNumSelectedEvts++;
     171    if (fResult)
     172        fNumSelectedEvts++;
     173
    175174    return kTRUE;
    176175}
    … …  
    201200    //---------------------------------
    202201    if (TestBit(kNumTotalFromFile))
     202    {
    203203        fNumTotalEvts = -1;
     204        if (fNumSelectEvts>0)
     205            fSelRatio = -1;
     206    }
    204207
    205208    return kTRUE;
Note: See TracChangeset for help on using the changeset viewer.