Changeset 17128 for trunk


Ignore:
Timestamp:
09/07/13 16:09:51 (11 years ago)
Author:
tbretz
Message:
Added missing includes etc which is necessary to include the files in any order.
Location:
trunk/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/Makefile.conf.linux

    r14921 r17128  
    1919OPTIM    := -O5 -std=c++0x -Wall -Winit-self -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Woverloaded-virtual
    2020# ggc 4.3: removed -Wshadow -fnonnull-objects -Wtraditional -Wnested-externs -Wconversion
    21 DEBUG    :=
     21DEBUG    := -g
    2222ARCHDEF  := -D__LINUX__
    2323SOFLAG   := -shared

  • trunk/Mars/mbase/MStatusDisplay.cc

    r13366 r17128  
    10861086    }*/
    10871087
     1088    gROOT->SetSelectedPad(0);
     1089
    10881090    if (gROOT->IsBatch())
    10891091    {

  • trunk/Mars/mcore/Interpolator2D.h

    r17122 r17128  
    1818
    1919#include <float.h>
     20#include <math.h>
    2021#include <vector>
    2122
    … …  
    330331        inputGrid.clear();
    331332        inputGrid.reserve(v.size());
    332         for (size_t i=0; i<v.size(); i++)
     333        for (std::size_t i=0; i<v.size(); i++)
    333334            inputGrid.emplace_back(i, v[i].x, v[i].y);
    334335
    … …  
    378379        outputGrid.clear();
    379380        outputGrid.reserve(v.size());
    380         for (size_t i=0; i<v.size(); i++)
     381        for (std::size_t i=0; i<v.size(); i++)
    381382            outputGrid.emplace_back(i, v[i].first, v[i].second);
    382383

  • trunk/Mars/mcore/checksum.h

    r16897 r17128  
    55#include <arpa/inet.h>
    66#endif
     7
     8#include <stdint.h>
    79
    810namespace std

  • trunk/Mars/mcore/fits.h

    r17052 r17128  
    22#define MARS_fits
    33
    4 #ifdef __CINT__
    5 #define int8_t   Char_t
    6 #define int16_t  Short_t
    7 #define int32_t  Int_t
    8 #define int64_t  Long64_t
    9 #define uint8_t  UChar_t
    10 #define uint16_t UShort_t
    11 #define uint32_t UInt_t
    12 #define uint64_t ULong64_t
    13 #else
    144#include <stdint.h>
    15 #endif
    165
    176#include <map>
    … …  
    209#include <sstream>
    2110#include <algorithm>
    22 
    23 #ifdef __EXCEPTIONS
    2411#include <stdexcept>
    25 #endif
    2612
    2713#ifdef __CINT__

  • trunk/Mars/mcore/huffman.h

    r16442 r17128  
    383383    };
    384384
    385     bool Encode(std::string &bufout, const uint16_t *bufin, size_t bufinlen)
     385    inline bool Encode(std::string &bufout, const uint16_t *bufin, size_t bufinlen)
    386386    {
    387387        const Encoder encoder(bufin, bufinlen);
    … …  
    399399    }
    400400
    401     int64_t Decode(const uint8_t *bufin,
    402                size_t         bufinlen,
    403                std::vector<uint16_t> &pbufout)
     401    inline int64_t Decode(const uint8_t *bufin,
     402                          size_t         bufinlen,
     403                          std::vector<uint16_t> &pbufout)
    404404    {
    405405        int64_t i = 0;

  • trunk/Mars/mcore/izstream.h

    r15266 r17128  
    22#define MARS_izstream
    33
     4#include <string.h>
     5
    46#include <istream>
    57#include <streambuf>
    6 
    7 #ifdef __MARS__
    8 #ifndef ROOT_TObject
    9 #include <TObject.h> // Needed for ClassDef
    10 #endif
    11 #endif
    128
    139#ifdef __CINT__
    … …  
    170166        return seekoff(pos, std::ios::beg);
    171167    }
    172 
    173 #ifdef __MARS__
    174     ClassDef(izstream, 0) // A C++ wrapper to istream zlib files
    175 #endif
    176168};
    177169

  • trunk/Mars/mcore/ofits.h

    r16602 r17128  
    1111#include <vector>
    1212#include <algorithm>
    13 
    14 #ifdef __EXCEPTIONS
    1513#include <stdexcept>
     14
     15#ifdef __CINT__
     16#define off_t size_t
     17#endif
     18
     19#ifndef __MARS__
     20#define gLog cerr
     21#define ___err___   ""
     22#define ___warn___  ""
     23#define ___all___   ""
     24#else
     25#include "MLog.h"
     26#include "MLogManip.h"
     27#define ___err___   err
     28#define ___warn___  warn
     29#define ___all___   all
    1630#endif
    1731

  • trunk/Mars/mcore/zfits.h

    r17035 r17128  
    66 */
    77
    8 #ifndef MARS_ZFITS
    9 #define MARS_ZFITS
    10 
    11 #include <stdexcept>
     8#ifndef MARS_zfits
     9#define MARS_zfits
    1210
    1311#include "fits.h"

  • trunk/Mars/mimage/MHVsSize.cc

    r9851 r17128  
    100100    fM3Long.SetYTitle("M3Long [\\circ]");
    101101
    102     const MBinning binse( 50,   10, 1e5, "", "log");
     102    const MBinning binse( 50,  1e3, 1e7, "", "log");
    103103    const MBinning binsc(100, 3e-3, 1,   "", "log");
    104104    const MBinning binsl(100,    0, 0.5);
    105     const MBinning binsd(100,    0, 2.0);
     105    const MBinning binsd(120,    0, 2.5);
    106106    const MBinning binsa(100,    0, 0.25);
    107107    const MBinning binsm(100, -1.5, 1.5);

  • trunk/Mars/mpedestal/MPedCalcPedRun.cc

    r14899 r17128  
    256256void MPedCalcPedRun::Calc()
    257257{
    258     if (fIsNotPedRun && !IsPedBitSet())
    259         return;
     258//    if (fIsNotPedRun && !IsPedBitSet())
     259//        return;
    260260
    261261    MRawEvtPixelIter pixel(fRawEvt);
Note: See TracChangeset for help on using the changeset viewer.