Changeset 6896


Ignore:
Timestamp:
03/29/05 11:54:38 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6895 r6896  
    9191     - added MHVsSize to the tabs which are shown
    9292
    93    * mjobs/MJOptimize.h:
     93   * mjobs/MJOptimize.[h,cc]:
    9494     - added dummy parameters to FixParameter for compatibility
    9595       with SetParemeter
     96     - replaced MFSupercuts by MFMagicCuts
     97     - use Energy in MHAlpha instead of size
    9698
    9799   * mbase/MFilter.[h,cc]:
  • trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

    r6895 r6896  
    1313#pragma link C++ class MFSoftwareTrigger+;
    1414#pragma link C++ class MFCosmics+;
    15 #pragma link C++ class MFSupercuts+;
    1615#pragma link C++ class MFMagicCuts+;
    1716
  • trunk/MagicSoft/Mars/mfilter/Makefile

    r6895 r6896  
    2727           MFSoftwareTrigger.cc \
    2828           MFCosmics.cc \
     29           MFMagicCuts.cc \
    2930           MFEnergySlope.cc
    3031
  • trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

    r6282 r6896  
    108108#include "MF.h"
    109109#include "MFilterList.h"
    110 #include "../mfilter/MFSupercuts.h"
     110#include "../mfilter/MFMagicCuts.h"
     111//#include "../mfilter/MFSupercuts.h"
    111112#include "MContinue.h"
    112113#include "MGeomCamMagic.h"
     
    801802    hist.InitMapping(&m);
    802803
    803     if (filter && filter->InheritsFrom(MFSupercuts::Class()))
    804         ((MFSupercuts*)filter)->InitMapping(&m);
     804    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
     805        ((MFMagicCuts*)filter)->InitMapping(&m);
    805806
    806807    MReadTree read("Events");
     
    873874    histof.SkipHistTheta();
    874875    //histof.SkipHistEnergy();
    875     // FIXME: MHillasSrc.fAlpha is added twice!
    876     histon.InitMapping(&m, 1);
    877     histof.InitMapping(&m, 1);
    878 
    879     if (filter && filter->InheritsFrom(MFSupercuts::Class()))
    880         ((MFSupercuts*)filter)->InitMapping(&m);
     876    histon.InitMapping(&m, 0);
     877    histof.InitMapping(&m, 0);
     878
     879//    if (filter && filter->InheritsFrom(MFSupercuts::Class()))
     880//        ((MFSupercuts*)filter)->InitMapping(&m);
     881    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
     882        ((MFMagicCuts*)filter)->InitMapping(&m);
    881883
    882884    parlist.AddToList(&histon);
     
    975977    parlist.AddToList(&m);
    976978
     979    MHEnergyEst hist;
     980    hist.InitMapping(&m);
     981
    977982    MEnergyEstimate est("MParameters");
    978983    est.SetRule(rule);
    979984    parlist.AddToList(&est);
    980985
    981     MHEnergyEst hist;
    982     hist.InitMapping(&m);
    983 
    984986    MReadTree read("Events");
    985     //read.DisableAutoScheme();
     987    // NECESSARY BECAUSE OF MDataFormula GetRules missing
     988    read.DisableAutoScheme();
    986989    if (fname)
    987990        read.AddFile(fname);
  • trunk/MagicSoft/Mars/mjobs/MJOptimize.h

    r6282 r6896  
    129129            fStep[idx] = step;
    130130    }
    131     void FixParameter(Int_t idx, Double_t start)
     131    void FixParameter(Int_t idx, Double_t start, Double_t lo=0, Double_t up=0, Double_t step=-1)
    132132    {
    133133        if (fParameters.GetSize()<=idx)
Note: See TracChangeset for help on using the changeset viewer.