Changeset 1210


Ignore:
Timestamp:
01/22/02 19:07:32 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1209 r1210  
    1515   * mmain/MAnalysis.cc, macros/MagicHillas.C:
    1616     - changed to new stylish MHillas parameter containers
     17
     18   * meventdisp/MGEvtDisplay.cc, mgui/MCamDisplay.cc,
     19     mmain/MDataCheck.[h,cc]:
     20     - fixed a warning in red hat linux
     21 
     22   * mfilter/FilterLinkDef.h, mfilter/Makefile:
     23     - added MFAlpha
     24 
     25   * mhist/MHHillas.[h,cc], mhist/MHHillasSrc.[h,cc]:
     26     - added SetupFill and usage of MBinning objects
    1727
    1828

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

    r1203 r1210  
    2828#pragma link C++ class MHillasCalc+;
    2929
     30#pragma link C++ class MEnergyEst+;
     31#pragma link C++ class MEnergyEstimate+;
     32
    3033#pragma link C++ class MPedCalcPedRun+;
    3134

  • trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

    r1102 r1210  
    469469    TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
    470470
    471     fi.fFileTypes = gSaveAsTypes;
     471    fi.fFileTypes = (const char**)gSaveAsTypes;
    472472    fi.fIniDir    = StrDup(dir);
    473473

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

    r1015 r1210  
    55#pragma link off all functions;
    66
     7#pragma link C++ class MFAlpha+;
    78#pragma link C++ class MFTriggerLvl1+;
    89

  • trunk/MagicSoft/Mars/mfilter/Makefile

    r1052 r1210  
    2020# @endcode
    2121
    22 INCLUDES = -I. -I../mbase -I../mmc
     22INCLUDES = -I. -I../mbase -I../mmc -I../manalysis
    2323
    2424# @code
    … …  
    3131.SUFFIXES: .c .cc .cxx .h .hxx .o
    3232
    33 SRCFILES = MFTriggerLvl1.cc
     33SRCFILES = MFTriggerLvl1.cc \
     34           MFAlpha.cc
    3435
    3536SRCS    = $(SRCFILES)

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

    r1203 r1210  
    291291    //   first treat the over- and under-flows
    292292    //
    293     const Float_t maxcolidx = 49.0;
     293    const Int_t maxcolidx = 49;
    294294
    295295    if (val >= fMaxPhe)
    … …  
    303303    //
    304304    const Float_t ratio  = (val-fMinPhe) / (fMaxPhe-fMinPhe);
    305     const Int_t   colidx = (Int_t)(maxcolidx*ratio + .5);
     305    const Int_t   colidx = (Int_t)(ratio*maxcolidx + .5);
    306306
    307307    return gStyle->GetColorPalette(colidx);

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

    r1208 r1210  
    88
    99#pragma link C++ class MH+;
    10 #pragma link C++ class MBinning+;
    1110#pragma link C++ class MHFadcCam+;
    1211#pragma link C++ class MHFadcPix+;
    … …  
    1413#pragma link C++ class MHHillasSrc+;
    1514#pragma link C++ class MHStarMap+;
     15#pragma link C++ class MHEnergyTime+;
     16#pragma link C++ class MHEnergyTheta+;
    1617#pragma link C++ class MHMcEnergy+;
    1718#pragma link C++ class MHMcCollectionArea+;
     19#pragma link C++ class MHAlphaEnergyTime;
     20#pragma link C++ class MHAlphaEnergyTheta;
     21#pragma link C++ class MHEffOnTimeTime+;
     22#pragma link C++ class MHEffOnTimeTheta+;
     23#pragma link C++ class MHDiffTimeTime+;
     24#pragma link C++ class MHDiffTimeTheta+;
     25
     26#pragma link C++ class MBinning+;
    1827
    1928#pragma link C++ class MHMcRate+;

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

    r1209 r1210  
    8787    fTitle = title ? title : "Task to fill Mars histograms";
    8888
    89     fH            = NULL;
    90     fParContainer = NULL;
     89    fH                = NULL;
     90    fParContainer     = NULL;
    9191}
    9292

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

    r1207 r1210  
    4040
    4141#include "MHillas.h"
     42#include "MParList.h"
    4243
    4344ClassImp(MHHillas);
    … …  
    4748// Setup four histograms for Width, Length
    4849//
    49 MHHillas::MHHillas (const char *name, const char *title)
     50MHHillas::MHHillas(const char *name, const char *title)
    5051{
    5152    //
    5253    //   set the name and title of this object
    5354    //
    54     fName  = name  ? name  : "MHHillas" ;
    55     fTitle = title ? title : "Container for Hillas histograms" ;
     55    fName  = name  ? name  : "MHHillas";
     56    fTitle = title ? title : "Container for Hillas histograms";
    5657
    5758    //
    … …  
    8182    delete fWidth;
    8283    delete fLength;
     84}
     85
     86// --------------------------------------------------------------------------
     87//
     88// Setup the Binning for the histograms automatically if the correct
     89// instances of MBinning (with the names 'BinningWidth' and 'BinningLength')
     90// are found in the parameter list
     91//
     92Bool_t MHHillas::SetupFill(const MParList *plist)
     93{
     94    const MBinning* binsw = (MBinning*)plist->FindObject("BinningWidth");
     95    const MBinning* binsl = (MBinning*)plist->FindObject("BinningLength");
     96
     97    if (binsw)
     98        SetBinning(fWidth, binsw);
     99
     100    if (binsl)
     101        SetBinning(fLength, binsl);
     102
     103    return kTRUE;
    83104}
    84105

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

    r1209 r1210  
    1919    ~MHHillas();
    2020
     21    Bool_t SetupFill(const MParList *pList);
    2122    Bool_t Fill(const MParContainer *par);
    2223

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

    r1209 r1210  
    3838#include <TCanvas.h>
    3939
     40#include "MParList.h"
     41
    4042#include "MHillas.h"
    4143#include "MHillasSrc.h"
    … …  
    5254    //   set the name and title of this object
    5355    //
    54     fName  = name  ? name  : "MHHillasSrc" ;
    55     fTitle = title ? title : "Container for Hillas histograms" ;
     56    fName  = name  ? name  : "MHHillasSrc";
     57    fTitle = title ? title : "Container for Hillas histograms";
    5658
    5759    //
    … …  
    8183    delete fAlpha;
    8284    delete fDist;
     85}
     86
     87// --------------------------------------------------------------------------
     88//
     89// Setup the Binning for the histograms automatically if the correct
     90// instances of MBinning (with the names 'BinningAlpha' and 'BinningDist')
     91// are found in the parameter list
     92//
     93Bool_t MHHillasSrc::SetupFill(const MParList *plist)
     94{
     95    const MBinning* binsa = (MBinning*)plist->FindObject("BinningAlpha");
     96    const MBinning* binsd = (MBinning*)plist->FindObject("BinningDist");
     97
     98    if (binsa)
     99        SetBinning(fAlpha, binsa);
     100
     101    if (binsd)
     102        SetBinning(fDist, binsd);
     103
     104    return kTRUE;
    83105}
    84106

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

    r1209 r1210  
    1919    ~MHHillasSrc();
    2020
     21    Bool_t SetupFill(const MParList *pList);
    2122    Bool_t Fill(const MParContainer *par);
    2223

  • trunk/MagicSoft/Mars/mmain/MDataCheck.cc

    r1172 r1210  
    9797//  histograms.
    9898//
    99 void MDataCheck::ViewAdcSpectra(const Char_t *inputfile, const Char_t *treeName)
     99void MDataCheck::ViewAdcSpectra(const char *inputfile, const char *treeName)
    100100{
    101101    //

  • trunk/MagicSoft/Mars/mmain/MDataCheck.h

    r1172 r1210  
    99{
    1010private:
    11     void ViewAdcSpectra(const Char_t *inputfile, const Char_t *treeName);
     11    void ViewAdcSpectra(const char *inputfile, const char *treeName);
    1212
    1313public:
    1414    MDataCheck(const TGWindow *main=NULL, const TGWindow *p=NULL,
    15                     const UInt_t w=500, const UInt_t h=500) ;
     15               const UInt_t w=500, const UInt_t h=500) ;
    1616
    1717    Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
Note: See TracChangeset for help on using the changeset viewer.