Changeset 5099 for trunk/MagicSoft


Ignore:
Timestamp:
09/17/04 14:51:02 (20 years ago)
Author:
moralejo
Message:
Adapted headers to current c++ style, removed -Wno-deprecated from
compilation options.
Location:
trunk/MagicSoft/Simulation/Detector
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.cxx

    r5082 r5099  
    11#include "MStarLight.hxx"
     2
     3using namespace std;
    24
    35MStarLight::MStarLight() {

  • trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.hxx

    r5082 r5099  
    88#include "TH1.h"
    99#include "TFile.h"
    10 #include "iostream.h"
    11 #include "fstream.h"
     10#include <iostream>
     11#include <fstream>
    1212#include "stdlib.h"
    1313#include "TRandom2.h"

  • trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile

    r5082 r5099  
    1919#
    2020# $RCSfile: Makefile,v $
    21 # $Revision: 1.6 $
     21# $Revision: 1.7 $
    2222# $Author: moralejo $
    23 # $Date: 2004-09-16 16:20:13 $
     23# $Date: 2004-09-17 13:51:01 $
    2424#
    2525##################################################################
    … …  
    4040        -I${INCLUDE_COR}  \
    4141        -I${INCLUDE_MC}   \
    42         -I${INCLUDE_EVITA}   \
    43         -I${INCLUDE_EVITA_MC}   \
    44         -I${INCLUDE_EVITA_RAW}   \
    45         -I${INCLUDE_EVITA_BASE}   \
    46         -I${INCLUDE_MARS_MGEOM}   \
    4742        -I${INCLUDE_TRIGGER}   \
    4843        -I${INCLUDE_FADC}   \
    4944        -I${INCLUDE_ROOT} \
    50         -I${INCLUDE_CPLUS}
     45        -I${INCLUDE_CPLUS} \
     46        -I${INCLUDE_MARS_MBASE} \
     47        -I${INCLUDE_MARS_MGEOM} \
     48        -I${INCLUDE_MARS_MGUI} \
     49        -I${INCLUDE_MARS_MC} \
     50        -I${INCLUDE_MARS_MRAW}
     51
    5152
    5253RANLIB  = -L${RANLIBDIR} -lranlib
    … …  
    5859
    5960osf_FORLIBS = -lUfor -lfor -lutil -lots -lm
    60 #linux_FORLIBS =  -lf2c -lm /usr/lib/libc.a
    6161linux_FORLIBS =  -lm -ldl
    62 #linux_FORLIBS =  -lm -ldl -rdynamic
    6362generic_FORLIBS = -lm
     63
     64MARSLIBS = ../../../Mars/libmars.so
    6465
    6566FORLIBS = ${${SYSTEM}_FORLIBS}
    … …  
    7071CFLAGS    = ${CXXFLAGS}
    7172FFLAGS    = ${CXXFLAGS}
    72 LIBS      = ${RANLIB} ${ROOTLIBS} ${ROOTGLIBS} ${GLIBS}
     73LIBS      = ${RANLIB} ${ROOTLIBS} ${ROOTGLIBS} ${GLIBS} ${MARSLIBS}
    7374
    7475#

  • trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.Linux

    r2432 r5099  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.Linux,v $
    20 # $Revision: 1.2 $
    21 # $Author: blanch $
    22 # $Date: 2003-10-26 20:07:10 $
     20# $Revision: 1.3 $
     21# $Author: moralejo $
     22# $Date: 2004-09-17 13:51:01 $
    2323##################################################################
    2424# @maintitle
    … …  
    4141INCLUDE_TRIGGER = ../include-MTrigger
    4242INCLUDE_FADC    = ../include-MFadc
    43 INCLUDE_EVITA   = ../../../include-Classes
    44 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    45 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    46 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    47 INCLUDE_REFL    = ../Reflector
    4843INCLUDE_ROOT    = ${ROOTSYS}/include
    4944INCLUDE_CPLUS   = /usr/include/g++
     45
     46INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     47INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     48INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     49INCLUDE_MARS_MC     = ../../../Mars/mmc
     50INCLUDE_MARS_MRAW   = ../../../Mars/mraw
    5051
    5152# all the stuff for ROOT
    … …  
    5455ROOTLIBS      = `root-config --libs`
    5556
    56 #       -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lm -ldl -rdynamic
    57 
    5857ROOTGLIBS     = `root-config --glibs`
    59 
    60 #       -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lGui -lm -ldl -rdynamic
    6158
    6259GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib \
    … …  
    6663# compiler options
    6764
    68 #OPTIM    = -O2 -ieee 
    6965OPTIM    = -O2 -Wall -fPIC
    7066DEBUG    = -g
    … …  
    7369
    7470RANLIBDIR = ../lib
    75 CERNDIR = /cern
    7671
    7772# system

  • trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux

    r5082 r5099  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.linux,v $
    20 # $Revision: 1.3 $
     20# $Revision: 1.4 $
    2121# $Author: moralejo $
    22 # $Date: 2004-09-16 16:20:13 $
     22# $Date: 2004-09-17 13:51:01 $
    2323##################################################################
    2424# @maintitle
    … …  
    4141INCLUDE_TRIGGER = ../include-MTrigger
    4242INCLUDE_FADC    = ../include-MFadc
    43 INCLUDE_EVITA   = ../../../include-Classes
    44 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    45 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    46 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    47 INCLUDE_MARS_MGEOM   = ../../../include-Classes/mgeom
    48 INCLUDE_REFL    = ../Reflector
    4943INCLUDE_ROOT    = ${ROOTSYS}/include
    5044INCLUDE_CPLUS   = /usr/include/g++
     45
     46INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     47INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     48INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     49INCLUDE_MARS_MC     = ../../../Mars/mmc
     50INCLUDE_MARS_MRAW   = ../../../Mars/mraw
    5151
    5252# all the stuff for ROOT
    … …  
    5555ROOTLIBS      = `root-config --libs`
    5656
    57 #       -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lm -ldl -rdynamic
    58 
    5957ROOTGLIBS     = `root-config --glibs`
    60 
    61 #       -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lGui -lm -ldl -rdynamic
    6258
    6359GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib \
    … …  
    6763# compiler options
    6864
    69 #OPTIM    = -O2 -ieee 
    70 OPTIM    = -O2 -Wall -fPIC -Wno-deprecated
     65OPTIM    = -O2 -Wall -fPIC
    7166DEBUG    = -g
    7267
    … …  
    7469
    7570RANLIBDIR = ../lib
    76 CERNDIR = /cern
    7771
    7872# system

  • trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux-gnu

    r2432 r5099  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.linux-gnu,v $
    20 # $Revision: 1.2 $
    21 # $Author: blanch $
    22 # $Date: 2003-10-26 20:10:41 $
     20# $Revision: 1.3 $
     21# $Author: moralejo $
     22# $Date: 2004-09-17 13:51:01 $
    2323##################################################################
    2424# @maintitle
    … …  
    4141INCLUDE_TRIGGER = ../include-MTrigger
    4242INCLUDE_FADC    = ../include-MFadc
    43 INCLUDE_EVITA   = ../../../include-Classes
    44 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    45 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    46 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    47 INCLUDE_REFL    = ../Reflector
    4843INCLUDE_ROOT    = ${ROOTSYS}/include
    4944INCLUDE_CPLUS   = /usr/include/g++
     45
     46INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     47INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     48INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     49INCLUDE_MARS_MC     = ../../../Mars/mmc
     50INCLUDE_MARS_MRAW   = ../../../Mars/mraw
    5051
    5152# all the stuff for ROOT
    … …  
    5455ROOTLIBS      = `root-config --libs`
    5556
    56 #       -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lm -ldl -rdynamic
    57 
    5857ROOTGLIBS     = `root-config --glibs`
    59 
    60 #       -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lGui -lm -ldl -rdynamic
    6158
    6259GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib \
    … …  
    6663# compiler options
    6764
    68 #OPTIM    = -O2 -ieee 
    6965OPTIM    = -O2 -Wall -fPIC
    7066DEBUG    = -g
    … …  
    7369
    7470RANLIBDIR = ../lib
    75 CERNDIR = /cern
    7671
    7772# system

  • trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.osf1

    r2432 r5099  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.osf1,v $
    20 # $Revision: 1.3 $
    21 # $Author: blanch $
    22 # $Date: 2003-10-26 20:12:30 $
     20# $Revision: 1.4 $
     21# $Author: moralejo $
     22# $Date: 2004-09-17 13:51:01 $
    2323##################################################################
    2424# @maintitle
    … …  
    4141INCLUDE_TRIGGER = ../include-MTrigger
    4242INCLUDE_FADC    = ../include-MFadc
    43 INCLUDE_EVITA   = ../../../include-Classes
    44 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    45 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    46 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    47 INCLUDE_REFL    = ../Reflector
    4843INCLUDE_ROOT    = ${ROOTSYS}/include
    4944INCLUDE_CPLUS   = /usr/include/cxx
    5045
    51 OPTIM    = -ieee -arch host   
    52 #OPTIM    = -O2 -Wall -fPIC
    53 DEBUG    = -g
     46INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     47INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     48INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     49INCLUDE_MARS_MC     = ../../../Mars/mmc
     50INCLUDE_MARS_MRAW   = ../../../Mars/mraw
    5451
    55 # libraries
     52# all the stuff for ROOT
     53
    5654
    5755ROOTLIBS =      `root-config --libs`
    5856
    59 #               -L/CERN/root/lib -lNew -lCore -lCint -lHist \
    60 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    61 #               -lMatrix -lPhysics -lm 
    62 
    6357ROOTGLIBS =     `root-config --glibs`
    64 
    65 #               -L/CERN/root/lib -lNew -lCore -lCint -lHist \
    66 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    67 #               -lMatrix -lPhysics -lGui -lm 
    6858
    6959GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
    … …  
    7161
    7262
     63# compiler options
     64
     65OPTIM    = -ieee -arch host   
     66DEBUG    = -g
     67
     68# libraries
     69
     70
    7371RANLIBDIR = ../lib
    74 CERNDIR = /cern
    7572
    7673# system

  • trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx

    r5082 r5099  
    1919//=
    2020//= $RCSfile: srreadparam.cxx,v $
    21 //= $Revision: 1.4 $
     21//= $Revision: 1.5 $
    2222//= $Author: moralejo $
    23 //= $Date: 2004-09-16 16:20:13 $
     23//= $Date: 2004-09-17 13:51:02 $
    2424//=
    2525//=//////////////////////////////////////////////////////////////////////
    … …  
    5252 
    5353//!@{
     54
     55using namespace std;
    5456
    5557#include "srreadparam.h"
    … …  
    304306//
    305307// $Log: not supported by cvs2svn $
     308// Revision 1.4  2004/09/16 16:20:13  moralejo
     309// *** empty log message ***
     310//
    306311// Revision 1.3  2004/01/30 10:34:59  blanch
    307312// Change in variables name to clarify the meaning.

  • trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.h

    r5082 r5099  
    1919//=
    2020//= $RCSfile: srreadparam.h,v $
    21 //= $Revision: 1.3 $
     21//= $Revision: 1.4 $
    2222//= $Author: moralejo $
    23 //= $Date: 2004-09-16 16:20:13 $
     23//= $Date: 2004-09-17 13:51:02 $
    2424//=
    2525//=//////////////////////////////////////////////////////////////////////
    … …  
    6161//!@{
    6262
    63 #include <iostream.h>
    64 #include <fstream.h>
     63#include <iostream>
     64#include <fstream>
    6565#include <stdlib.h>
    6666#include <stdio.h>
    67 #include <string.h>
     67#include <string>
    6868#include <math.h>
    6969#include <float.h>
    … …  
    145145/*
    146146 * $Log: not supported by cvs2svn $
     147 * Revision 1.3  2004/09/16 16:20:13  moralejo
     148 * *** empty log message ***
     149 *
    147150 * Revision 1.2  2001/03/05 11:02:10  blanch
    148151 * Header file for srreadparam.cxx 1.2

  • trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.cxx

    r5082 r5099  
    77#include "MTrigger.hxx"
    88#include "MFadc.hxx"
     9
     10using namespace std;
    911
    1012Int_t BuildStarLight( Float_t brightness, char *path, MTrigger *trigger, MFadc *fadc )

  • trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.hxx

    r632 r5099  
    33//
    44
    5 #include <iostream.h>
     5#include <iostream>
    66
    77#include "srreadparam.h"

  • trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.cxx

    r5079 r5099  
    1717
    1818#include "MGFadcSignal.hxx"
     19
     20using namespace std;
    1921
    2022MFadc::MFadc(Int_t pix, Int_t shape, Float_t integral, Float_t fwhm, Int_t shapeout, Float_t integralout, Float_t fwhmout, Float_t trigger_delay) {

  • trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx

    r5079 r5099  
    1111//
    1212//
    13 #include <stream.h>
     13#include <sstream>
    1414#include <math.h>
    1515

  • trunk/MagicSoft/Simulation/Detector/include-MFadc/MGFadcSignal.hxx

    r579 r5099  
    44
    55#include <stdlib.h>
    6 #include <iostream.h>
     6#include <iostream>
    77
    88#include <TROOT.h>

  • trunk/MagicSoft/Simulation/Detector/include-MTrigger/MGTriggerSignal.hxx

    r579 r5099  
    44
    55#include <stdlib.h>
    6 #include <iostream.h>
     6#include <iostream>
    77
    88#include <TROOT.h>

  • trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx

    r5082 r5099  
    1313#include "MGeomCam.h"
    1414#include "MGeomPix.h"
     15
     16using namespace std;
    1517
    1618MTrigger::MTrigger(int pix) {
    … …  
    12661268    ii=(Int_t)i/8;
    12671269    if (dknt[i]==kTRUE){
    1268       map[ii]=map[ii]+(Int_t)pow(2,i-ii*8);
     1270      map[ii]=map[ii]+(Int_t)pow((double)2, (double)i-ii*8);
    12691271    }
    12701272  }

  • trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx

    r5082 r5099  
    1515//
    1616//
    17 #include <iostream.h>
     17#include <iostream>
    1818#include <math.h>
    1919
Note: See TracChangeset for help on using the changeset viewer.