Changeset 1211


Ignore:
Timestamp:
01/22/02 20:50:06 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
15 added
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1210 r1211  
    2525   * mhist/MHHillas.[h,cc], mhist/MHHillasSrc.[h,cc]:
    2626     - added SetupFill and usage of MBinning objects
     27
     28   * manalysis/MEnergyEst.[h,cc], manalysis/MEnergyEstimate.[h,cc],
     29     mhist/MHTimeDiffTime.[h,cc], mhist/MHEnergyTheta.[h,cc],
     30     mhist/MHEnergyTime.[h,cc], mhist/MHAlphaEnergyTheta.[h,cc],
     31     mhist/MHAlphaEnergyTime.[h,cc], mhist/MHTimeDiffTheta.[h,cc],
     32     mmontecarlo/MMcTimeGenerate.[h,cc]:
     33     - added
     34
     35   * manalysis/Makefile:
     36     - added MEnergyEst.cc
     37     - added MEnergyEstimate.cc
     38   
     39   * mbase/MFilter.[h,cc], mfilter/MF*.[h,cc]:
     40     - added name and title to constructor
    2741
    2842

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

    r1203 r1211  
    2020!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
    2121!
    22 !   Copyright: MAGIC Software Development, 2000-2001
     22!   Copyright: MAGIC Software Development, 2000-2002
    2323!
    2424!

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

    r1203 r1211  
    1919!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

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

    r1203 r1211  
    1919!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

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

    r1203 r1211  
    2020!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
    2121!
    22 !   Copyright: MAGIC Software Development, 2000-2001
     22!   Copyright: MAGIC Software Development, 2000-2002
    2323!
    2424!

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

    r1209 r1211  
    1919!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

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

    r1203 r1211  
    1919!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

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

    r1203 r1211  
    1919!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r1203 r1211  
    3434           MMcPedestalNSBAdd.cc \
    3535           MImgCleanStd.cc \
     36           MEnergyEst.cc \
     37           MEnergyEstimate.cc \
    3638           MSrcPosCam.cc \
    3739           MHillas.cc \
     40           MHillasSrc.cc \
    3841           MHillasExt.cc \
    3942           MHillasCalc.cc \
    40            MHillasSrc.cc \
    4143           MHillasSrcCalc.cc \
     44           MCerPhotPix.cc \
    4245           MCerPhotCalc.cc \
    4346           MCerPhotEvt.cc \
    44            MCerPhotPix.cc \
    4547           MPedCalcPedRun.cc \
    4648           MBlindPixels.cc \

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

    r1080 r1211  
    7272ClassImp(MFilter);
    7373
     74MFilter::MFilter(const char *name, const char *title)
     75{
     76    fName  = name  ? name  : "MFilter";
     77    fTitle = title ? title : "Base Class for a filter";
     78}
     79
    7480// --------------------------------------------------------------------------
    7581//

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

    r1014 r1211  
    1111{
    1212public:
    13     MFilter() {}
    14     ~MFilter()
    15     {
    16     }
     13    MFilter(const char *name=NULL, const char *title=NULL);
    1714
    1815    virtual Bool_t IsExpressionTrue() const = 0;

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

    r1203 r1211  
    1818!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!

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

    r1187 r1211  
    1818!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!

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

    r1203 r1211  
    1818!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!

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

    r1203 r1211  
    1818!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!
    … …  
    577577    // will be fixed in 3.03
    578578    //
     579#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,01)
    579580    if (fNumEntry >= fNumEntries)
    580581        return kFALSE;
     582#endif
    581583
    582584#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)

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

    r1208 r1211  
    4444// --------------------------------------------------------------------------
    4545//
    46 MFAlpha::MFAlpha(const char *cname, const char type, const Float_t val) : fHillas(NULL)
     46MFAlpha::MFAlpha(const char *cname, const char type, const Float_t val,
     47                 const char *name, const char *title) : fHillas(NULL)
    4748{
    4849    fContName = cname;
    49     Init(type, val);
     50    Init(type, val, name, title);
    5051}
    5152
    5253// --------------------------------------------------------------------------
    5354//
    54 MFAlpha::MFAlpha(const MHillasSrc *hillas, const char type, const Float_t val) : fHillas(hillas)
     55MFAlpha::MFAlpha(const MHillasSrc *hillas, const char type, const Float_t val,
     56                 const char *name, const char *title) : fHillas(hillas)
    5557{
    56     Init(type, val);
     58    Init(type, val, name, title);
    5759}
    5860
    5961// --------------------------------------------------------------------------
    6062//
    61 void MFAlpha::Init(const char type, const Int_t val)
     63void MFAlpha::Init(const char type, const Int_t val,
     64                   const char *name, const char *title)
    6265{
     66    fName  = name  ? name  : "MFAlpha";
     67    fTitle = title ? title : "Filter using the alpha angle";
     68
    6369    fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
    6470

  • trunk/MagicSoft/Mars/mfilter/MFAlpha.h

    r1209 r1211  
    2727    Float_t fValue; // [deg]
    2828
    29     void Init(const char type, const Int_t val);
     29    void Init(const char type, const Int_t val,
     30              const char *name, const char *title);
    3031
    3132public:
    32     MFAlpha(const char       *cname="MHillas", const char type='>', const Float_t deg=15);
    33     MFAlpha(const MHillasSrc *hillas,          const char type='>', const Float_t deg=15);
     33    MFAlpha(const char       *cname="MHillas", const char type='>', const Float_t deg=15,
     34            const char *name=NULL, const char *title=NULL);
     35    MFAlpha(const MHillasSrc *hillas,          const char type='>', const Float_t deg=15,
     36            const char *name=NULL, const char *title=NULL);
    3437
    3538    Bool_t IsExpressionTrue() const;

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

    r1116 r1211  
    4242// --------------------------------------------------------------------------
    4343//
    44 MFTriggerLvl1::MFTriggerLvl1(const char *cname, const char type, const Int_t val) : fMcTrig(NULL)
     44MFTriggerLvl1::MFTriggerLvl1(const char *cname, const char type, const Int_t val,
     45                             const char *name, const char *title) : fMcTrig(NULL)
    4546{
    4647    fContName = cname;
    47     Init(type, val);
     48    Init(type, val, name, title);
    4849}
    4950
    5051// --------------------------------------------------------------------------
    5152//
    52 MFTriggerLvl1::MFTriggerLvl1(const MMcTrig *mctrig, const char type, const Int_t val) : fMcTrig(mctrig)
     53MFTriggerLvl1::MFTriggerLvl1(const MMcTrig *mctrig, const char type, const Int_t val,
     54                             const char *name, const char *title) : fMcTrig(mctrig)
    5355{
    54     Init(type, val);
     56    Init(type, val, name, title);
    5557}
    5658
    5759// --------------------------------------------------------------------------
    5860//
    59 void MFTriggerLvl1::Init(const char type, const Int_t val)
     61void MFTriggerLvl1::Init(const char type, const Int_t val,
     62                         const char *name, const char *title)
    6063{
     64    fName  = name  ? name  : "MFTriggerLvl1";
     65    fTitle = title ? title : "Filter using number of 1st level triggers";
     66
    6167    fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
    6268

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

    r1015 r1211  
    2727    Int_t  fValue;
    2828
    29     void Init(const char type, const Int_t val);
     29    void Init(const char type, const Int_t val,
     30              const char *name, const char *title);
    3031
    3132public:
    32     MFTriggerLvl1(const char *cname="MMcTrig", const char type='>', const Int_t val=0);
    33     MFTriggerLvl1(const MMcTrig *mctrig,       const char type='>', const Int_t val=0);
     33    MFTriggerLvl1(const char *cname="MMcTrig", const char type='>', const Int_t val=0,
     34                  const char *name=NULL, const char *title=NULL);
     35    MFTriggerLvl1(const MMcTrig *mctrig,       const char type='>', const Int_t val=0,
     36                  const char *name=NULL, const char *title=NULL);
    3437
    3538    Bool_t IsExpressionTrue() const;

  • trunk/MagicSoft/Mars/mgui/MGeomPix.cc

    r1082 r1211  
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

  • trunk/MagicSoft/Mars/mhist/HistLinkDef.h

    r1210 r1211  
    2121#pragma link C++ class MHEffOnTimeTime+;
    2222#pragma link C++ class MHEffOnTimeTheta+;
    23 #pragma link C++ class MHDiffTimeTime+;
    24 #pragma link C++ class MHDiffTimeTheta+;
     23#pragma link C++ class MHTimeDiffTime+;
     24#pragma link C++ class MHTimeDiffTheta+;
    2525
    2626#pragma link C++ class MBinning+;

  • trunk/MagicSoft/Mars/mhist/MFillH.cc

    r1210 r1211  
    1818!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!

  • trunk/MagicSoft/Mars/mhist/MH.cc

    r1207 r1211  
    1818!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!

  • trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

    r1208 r1211  
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

  • trunk/MagicSoft/Mars/mhist/MHStarMap.cc

    r1207 r1211  
    1818!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2002
    2121!
    2222!

  • trunk/MagicSoft/Mars/mhist/Makefile

    r1208 r1211  
    2222#  connect the include files defined in the config.mk file
    2323#
    24 INCLUDES = -I. -I../mbase -I../mraw -I../manalysis
     24INCLUDES = -I. -I../mbase -I../mraw -I../manalysis -I../mmc
    2525
    2626#------------------------------------------------------------------------------
    … …  
    3636           MHHillasSrc.cc \
    3737           MHStarMap.cc \
     38           MHEnergyTime.cc \
     39           MHEnergyTheta.cc \
    3840           MHMcCollectionArea.cc \
     41           MHAlphaEnergyTime.cc \
     42           MHAlphaEnergyTheta.cc \
     43           MHEffOnTimeTime.cc \
     44           MHEffOnTimeTheta.cc \
     45           MHTimeDiffTime.cc \
     46           MHTimeDiffTheta.cc \
    3947           MHMcEnergy.cc \
    4048           MHMcRate.cc

  • trunk/MagicSoft/Mars/mmontecarlo/Makefile

    r1052 r1211  
    3030SRCFILES = MMcCollectionAreaCalc.cc \
    3131           MMcThresholdCalc.cc \
     32           MMcTimeGenerate.cc \
    3233           MMcTriggerRateCalc.cc
    3334

  • trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h

    r1016 r1211  
    66
    77#pragma link C++ class MMcThresholdCalc+;
     8#pragma link C++ class MMcTimeGenerate+;
    89#pragma link C++ class MMcCollectionAreaCalc+;
    910#pragma link C++ class MMcTriggerRateCalc+;
Note: See TracChangeset for help on using the changeset viewer.