Ignore:
Timestamp:
04/12/05 17:05:49 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/manalysis
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r6915 r6932  
    1212#pragma link C++ class MMultiDimDistCalc+;
    1313
    14 #pragma link C++ class MEnergyEst+;
    1514#pragma link C++ class MEnergyEstimate+;
    1615

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

    r5956 r6932  
    4747
    4848#include "MDataChain.h"
    49 #include "MEnergyEst.h"
     49#include "MParameters.h"
    5050
    5151#include "MLog.h"
    … …  
    107107Int_t MEnergyEstimate::PreProcess(MParList *plist)
    108108{
    109     fEnergy = (MEnergyEst*)plist->FindCreateObj("MEnergyEst");
     109    fEnergy = (MParameterD*)plist->FindCreateObj("MParameterD", "MEnergyEst");
    110110    if (!fEnergy)
    111111        return kFALSE;
    … …  
    130130        return kCONTINUE;
    131131
    132     fEnergy->SetEnergy(val);
     132    fEnergy->SetVal(val);
    133133    fEnergy->SetReadyToSave();
    134134    return kTRUE;
     135}
     136
     137// --------------------------------------------------------------------------
     138//
     139// Print the rule used for energy estimation
     140//
     141void MEnergyEstimate::Print(Option_t *o) const
     142{
     143    *fLog << all << GetDescriptor() << ":";
     144    if (!fData)
     145        *fLog << " <n/a>" << endl;
     146    else
     147        *fLog << endl << fData->GetRule() << endl;
    135148}
    136149

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

    r5956 r6932  
    77
    88class MData;
    9 class MEnergyEst;
     9class MParameterD;
    1010
    1111class MEnergyEstimate : public MTask
    1212{
    1313private:
    14     MData      *fData;    //->
    15     MEnergyEst *fEnergy;
     14    MData       *fData;    //->
     15    MParameterD *fEnergy;  //!
    1616
    1717    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
    … …  
    2828    void SetVariables(const TArrayD &);
    2929
    30     ClassDef(MEnergyEstimate, 0) // Task to estimate the energy by a rule
     30    void Print(Option_t *o="") const;
     31
     32    ClassDef(MEnergyEstimate, 1) // Task to estimate the energy by a rule
    3133};
    3234

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r6915 r6932  
    2828SRCFILES = MGeomApply.cc \
    2929           MCameraData.cc \
    30            MEnergyEst.cc \
    3130           MEnergyEstimate.cc \
    3231           MMatrixLoop.cc \
Note: See TracChangeset for help on using the changeset viewer.