Changeset 2216


Ignore:
Timestamp:
06/23/03 14:33:49 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2209 r2216  
    122122   * mhist/MHSigmaTheta.cc:
    123123     - added a preliminary workaround to support files without MMcEvt
     124 
     125   * manalysis/AnalysisLinkDef.h, manalysis/Makefile:
     126     - removed MCT1PadONOFF
     127     
     128   * manalysis/MCerPhotEvt.h:
     129     - added -> to fPixels
     130
     131   * meventdisp/Makefile:
     132     - added -I../mhist
    124133
    125134

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

    r2167 r2216  
    4040
    4141#pragma link C++ class MCT1PadSchweizer+;
    42 #pragma link C++ class MCT1PadONOFF+;
     42//#pragma link C++ class MCT1PadONOFF+;
    4343
    4444#pragma link C++ class MCT1PointingCorrCalc+;

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

    r2206 r2216  
    1919private:
    2020    UInt_t        fNumPixels;
    21     TClonesArray *fPixels;     // FIXME: Change TClonesArray away from a pointer?
     21    TClonesArray *fPixels;     //-> FIXME: Change TClonesArray away from a pointer?
    2222
    2323public:

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r2167 r2216  
    5555           MSigmabarCalc.cc \
    5656           MCT1PadSchweizer.cc \
    57            MCT1PadONOFF.cc \
    5857           MCT1PointingCorrCalc.cc \
    5958           MParameters.cc \
    … …  
    6261           MCT1SupercutsCalc.cc \
    6362           MFiltercutsCalc.cc
     63#          MCT1PadONOFF.cc \
    6464
    6565SRCS    = $(SRCFILES)

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

    r2210 r2216  
    4040#include "MHillasSrcCalc.h"      // MHillasSrcCalc
    4141#include "MPedestalCam.h"        // MPedestalCam
    42 #include "MCerPhotAnal2.h"       // MCerPhotAnal
     42#include "MCerPhotAnal.h"        // MCerPhotAnal
    4343#include "MMcPedestalCopy.h"     // MMcPedestalCopy
    4444#include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
    … …  
    120120    MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
    121121    MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
    122     MCerPhotAnal2     *ncalc = new MCerPhotAnal2;
     122    MCerPhotAnal      *ncalc = new MCerPhotAnal;
    123123    MClone            *clone = new MClone("MCerPhotEvt");
    124124    MImgCleanStd      *clean = new MImgCleanStd;
    … …  
    205205//  together with the hillas ellipse or not.
    206206//
     207#include <iostream>
    207208void MGCamDisplay::UpdateDisplay()
    208209{

  • trunk/MagicSoft/Mars/meventdisp/Makefile

    r1945 r2216  
    2222#  connect the include files defined in the config.mk file
    2323#
    24 INCLUDES = -I. -I../mbase -I../mraw -I../mgui -I../mgeom \
    25            -I../manalysis -I../mfileio -I../mmc -I../mimage
     24INCLUDES = -I. -I../mbase -I../mraw -I../mgui -I../mgeom -I../mhist \
     25           -I../manalysis -I../mfileio -I../mmc -I../mimage 
    2626
    2727#------------------------------------------------------------------------------

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

    r2209 r2216  
    167167//   -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
    168168
     169#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    169170   if (fBuffer) return BufferFill(x,1);
    170 
     171#endif
    171172   const Int_t bin = (Int_t)x+1;
    172173   AddBinContent(bin);
    … …  
    199200//   -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
    200201
     202#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    201203   if (fBuffer) return BufferFill(x,w);
    202 
     204#endif
    203205   const Int_t bin = (Int_t)x+1;
    204206   AddBinContent(bin, w);
    … …  
    403405    // box with the histogram title
    404406    ptitle->SetTextColor(gStyle->GetTitleTextColor());
     407#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    405408    ptitle->SetTextFont(gStyle->GetTitleFont(""));
     409#endif
    406410    ptitle->Paint();
    407411}
    … …  
    412416//                       ========================
    413417   //if (Hoption.Same) return;
     418#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    414419    if (TestBit(kNoTitle))
    415420        return;
     421#endif
    416422
    417423    const Int_t nt = strlen(GetTitle());
    … …  
    460466
    461467    // box with the histogram title
     468#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
    462469    ptitle->SetFillColor(gStyle->GetTitleFillColor());
     470    ptitle->SetTextFont(gStyle->GetTitleFont(""));
     471    if (gStyle->GetTitleFont("")%10 > 2)
     472        ptitle->SetTextSize(gStyle->GetTitleFontSize());
     473#endif
    463474    ptitle->SetFillStyle(gStyle->GetTitleStyle());
    464475    ptitle->SetName("title");
    465476    ptitle->SetBorderSize(gStyle->GetTitleBorderSize());
    466477    ptitle->SetTextColor(gStyle->GetTitleTextColor());
    467     ptitle->SetTextFont(gStyle->GetTitleFont(""));
    468     if (gStyle->GetTitleFont("")%10 > 2)
    469         ptitle->SetTextSize(gStyle->GetTitleFontSize());
    470478    ptitle->AddText(GetTitle());
    471479    ptitle->SetBit(kCanDelete);
    … …  
    654662    for (Int_t idx=0; idx<fNcells-2; idx++)
    655663    {
    656         Fill(idx, event[idx]); // FIXME: Slow!
     664        Fill(idx, const_cast<TArrayD&>(event)[idx]); // FIXME: Slow!
    657665        //fArray[idx+1]+=val;
    658666
    … …  
    690698    for (Int_t idx=0; idx<fNcells-2; idx++)
    691699    {
    692         if (event[idx]>threshold)
     700        if (const_cast<TArrayD&>(event)[idx]>threshold)
    693701            Fill(idx);
    694702

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

    r2209 r2216  
    6868    };
    6969
    70     Bool_t IsUsed(Int_t idx) const { return TESTBIT(fUsed[idx], kIsUsed); }
     70    Bool_t IsUsed(Int_t idx) const { return TESTBIT(const_cast<TArrayC&>(fUsed)[idx], kIsUsed); }
    7171    void   SetUsed(Int_t idx)      { SETBIT(fUsed[idx], kIsUsed); }
    7272    void   ResetUsed(Int_t idx)    { CLRBIT(fUsed[idx], kIsUsed); }
    … …  
    9191
    9292    // This is a trick to remove TH1 entries from the context menu
    93     void Add(TF1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
    94     void Add(const TH1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
    95     void Add(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1) { TH1::Add(h1, h2, c1, c2); }
    96     void Divide(TF1 *f1, Double_t c1=1) { TH1::Divide(f1, c1); }
    97     void Divide(const TH1 *h1) { TH1::Divide(h1); }
    98     void Divide(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Divide(h1, h2, c1, c2, option); }
    99     void Multiply(TF1 *h1, Double_t c1=1) { TH1::Multiply(h1, c1); }
    100     void Multiply(const TH1 *h1) { TH1::Multiply(h1); }
    101     void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Multiply(h1, h2, c1, c2, option); }
     93    /*
     94     void Add(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1) { TH1::Add(h1, h2, c1, c2); }
     95     void Add(TF1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
     96     void Add(const TH1 *h1, Double_t c1=1) { TH1::Add(h1, c1); }
     97     void Divide(TF1 *f1, Double_t c1=1) { TH1::Divide(f1, c1); }
     98     void Divide(const TH1 *h1) { TH1::Divide(h1); }
     99     void Divide(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Divide(h1, h2, c1, c2, option); }
     100     void Multiply(TF1 *h1, Double_t c1=1) { TH1::Multiply(h1, c1); }
     101     void Multiply(const TH1 *h1) { TH1::Multiply(h1); }
     102     void Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { TH1::Multiply(h1, h2, c1, c2, option); }
     103     */
     104
    102105    void FitPanel() { TH1::FitPanel(); }
    103106
Note: See TracChangeset for help on using the changeset viewer.