Index: trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.cxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.cxx (revision 5099) @@ -1,3 +1,5 @@ #include "MStarLight.hxx" + +using namespace std; MStarLight::MStarLight() { Index: trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.hxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.hxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/MStarLight.hxx (revision 5099) @@ -8,6 +8,6 @@ #include "TH1.h" #include "TFile.h" -#include "iostream.h" -#include "fstream.h" +#include +#include #include "stdlib.h" #include "TRandom2.h" Index: trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile (revision 5099) @@ -19,7 +19,7 @@ # # $RCSfile: Makefile,v $ -# $Revision: 1.6 $ +# $Revision: 1.7 $ # $Author: moralejo $ -# $Date: 2004-09-16 16:20:13 $ +# $Date: 2004-09-17 13:51:01 $ # ################################################################## @@ -40,13 +40,14 @@ -I${INCLUDE_COR} \ -I${INCLUDE_MC} \ - -I${INCLUDE_EVITA} \ - -I${INCLUDE_EVITA_MC} \ - -I${INCLUDE_EVITA_RAW} \ - -I${INCLUDE_EVITA_BASE} \ - -I${INCLUDE_MARS_MGEOM} \ -I${INCLUDE_TRIGGER} \ -I${INCLUDE_FADC} \ -I${INCLUDE_ROOT} \ - -I${INCLUDE_CPLUS} + -I${INCLUDE_CPLUS} \ + -I${INCLUDE_MARS_MBASE} \ + -I${INCLUDE_MARS_MGEOM} \ + -I${INCLUDE_MARS_MGUI} \ + -I${INCLUDE_MARS_MC} \ + -I${INCLUDE_MARS_MRAW} + RANLIB = -L${RANLIBDIR} -lranlib @@ -58,8 +59,8 @@ osf_FORLIBS = -lUfor -lfor -lutil -lots -lm -#linux_FORLIBS = -lf2c -lm /usr/lib/libc.a linux_FORLIBS = -lm -ldl -#linux_FORLIBS = -lm -ldl -rdynamic generic_FORLIBS = -lm + +MARSLIBS = ../../../Mars/libmars.so FORLIBS = ${${SYSTEM}_FORLIBS} @@ -70,5 +71,5 @@ CFLAGS = ${CXXFLAGS} FFLAGS = ${CXXFLAGS} -LIBS = ${RANLIB} ${ROOTLIBS} ${ROOTGLIBS} ${GLIBS} +LIBS = ${RANLIB} ${ROOTLIBS} ${ROOTGLIBS} ${GLIBS} ${MARSLIBS} # Index: trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.Linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.Linux (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.Linux (revision 5099) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.Linux,v $ -# $Revision: 1.2 $ -# $Author: blanch $ -# $Date: 2003-10-26 20:07:10 $ +# $Revision: 1.3 $ +# $Author: moralejo $ +# $Date: 2004-09-17 13:51:01 $ ################################################################## # @maintitle @@ -41,11 +41,12 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_REFL = ../Reflector INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/g++ + +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw # all the stuff for ROOT @@ -54,9 +55,5 @@ ROOTLIBS = `root-config --libs` -# -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lm -ldl -rdynamic - ROOTGLIBS = `root-config --glibs` - -# -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lGui -lm -ldl -rdynamic GLIBS = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib \ @@ -66,5 +63,4 @@ # compiler options -#OPTIM = -O2 -ieee OPTIM = -O2 -Wall -fPIC DEBUG = -g @@ -73,5 +69,4 @@ RANLIBDIR = ../lib -CERNDIR = /cern # system Index: trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux (revision 5099) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.linux,v $ -# $Revision: 1.3 $ +# $Revision: 1.4 $ # $Author: moralejo $ -# $Date: 2004-09-16 16:20:13 $ +# $Date: 2004-09-17 13:51:01 $ ################################################################## # @maintitle @@ -41,12 +41,12 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_MARS_MGEOM = ../../../include-Classes/mgeom -INCLUDE_REFL = ../Reflector INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/g++ + +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw # all the stuff for ROOT @@ -55,9 +55,5 @@ ROOTLIBS = `root-config --libs` -# -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lm -ldl -rdynamic - ROOTGLIBS = `root-config --glibs` - -# -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lGui -lm -ldl -rdynamic GLIBS = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib \ @@ -67,6 +63,5 @@ # compiler options -#OPTIM = -O2 -ieee -OPTIM = -O2 -Wall -fPIC -Wno-deprecated +OPTIM = -O2 -Wall -fPIC DEBUG = -g @@ -74,5 +69,4 @@ RANLIBDIR = ../lib -CERNDIR = /cern # system Index: trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux-gnu =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux-gnu (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.linux-gnu (revision 5099) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.linux-gnu,v $ -# $Revision: 1.2 $ -# $Author: blanch $ -# $Date: 2003-10-26 20:10:41 $ +# $Revision: 1.3 $ +# $Author: moralejo $ +# $Date: 2004-09-17 13:51:01 $ ################################################################## # @maintitle @@ -41,11 +41,12 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_REFL = ../Reflector INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/g++ + +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw # all the stuff for ROOT @@ -54,9 +55,5 @@ ROOTLIBS = `root-config --libs` -# -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lm -ldl -rdynamic - ROOTGLIBS = `root-config --glibs` - -# -L/cern/root/lib -lNew -lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lGui -lm -ldl -rdynamic GLIBS = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib \ @@ -66,5 +63,4 @@ # compiler options -#OPTIM = -O2 -ieee OPTIM = -O2 -Wall -fPIC DEBUG = -g @@ -73,5 +69,4 @@ RANLIBDIR = ../lib -CERNDIR = /cern # system Index: trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.osf1 =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.osf1 (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/config.mk.osf1 (revision 5099) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.osf1,v $ -# $Revision: 1.3 $ -# $Author: blanch $ -# $Date: 2003-10-26 20:12:30 $ +# $Revision: 1.4 $ +# $Author: moralejo $ +# $Date: 2004-09-17 13:51:01 $ ################################################################## # @maintitle @@ -41,29 +41,19 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_REFL = ../Reflector INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/cxx -OPTIM = -ieee -arch host -#OPTIM = -O2 -Wall -fPIC -DEBUG = -g +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw -# libraries +# all the stuff for ROOT + ROOTLIBS = `root-config --libs` -# -L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lm - ROOTGLIBS = `root-config --glibs` - -# -L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lGui -lm GLIBS = $(ROOTLIBS) $(ROOTGLIBS) @@ -71,6 +61,13 @@ +# compiler options + +OPTIM = -ieee -arch host +DEBUG = -g + +# libraries + + RANLIBDIR = ../lib -CERNDIR = /cern # system Index: trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx (revision 5099) @@ -19,7 +19,7 @@ //= //= $RCSfile: srreadparam.cxx,v $ -//= $Revision: 1.4 $ +//= $Revision: 1.5 $ //= $Author: moralejo $ -//= $Date: 2004-09-16 16:20:13 $ +//= $Date: 2004-09-17 13:51:02 $ //= //=////////////////////////////////////////////////////////////////////// @@ -52,4 +52,6 @@ //!@{ + +using namespace std; #include "srreadparam.h" @@ -304,4 +306,7 @@ // // $Log: not supported by cvs2svn $ +// Revision 1.4 2004/09/16 16:20:13 moralejo +// *** empty log message *** +// // Revision 1.3 2004/01/30 10:34:59 blanch // Change in variables name to clarify the meaning. Index: trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.h =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.h (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.h (revision 5099) @@ -19,7 +19,7 @@ //= //= $RCSfile: srreadparam.h,v $ -//= $Revision: 1.3 $ +//= $Revision: 1.4 $ //= $Author: moralejo $ -//= $Date: 2004-09-16 16:20:13 $ +//= $Date: 2004-09-17 13:51:02 $ //= //=////////////////////////////////////////////////////////////////////// @@ -61,9 +61,9 @@ //!@{ -#include -#include +#include +#include #include #include -#include +#include #include #include @@ -145,4 +145,7 @@ /* * $Log: not supported by cvs2svn $ + * Revision 1.3 2004/09/16 16:20:13 moralejo + * *** empty log message *** + * * Revision 1.2 2001/03/05 11:02:10 blanch * Header file for srreadparam.cxx 1.2 Index: trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.cxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.cxx (revision 5099) @@ -7,4 +7,6 @@ #include "MTrigger.hxx" #include "MFadc.hxx" + +using namespace std; Int_t BuildStarLight( Float_t brightness, char *path, MTrigger *trigger, MFadc *fadc ) Index: trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.hxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.hxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/StarResponse/starresponse.hxx (revision 5099) @@ -3,5 +3,5 @@ // -#include +#include #include "srreadparam.h" Index: trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.cxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.cxx (revision 5099) @@ -17,4 +17,6 @@ #include "MGFadcSignal.hxx" + +using namespace std; MFadc::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) { Index: trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx (revision 5099) @@ -11,5 +11,5 @@ // // -#include +#include #include Index: trunk/MagicSoft/Simulation/Detector/include-MFadc/MGFadcSignal.hxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/include-MFadc/MGFadcSignal.hxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/include-MFadc/MGFadcSignal.hxx (revision 5099) @@ -4,5 +4,5 @@ #include -#include +#include #include Index: trunk/MagicSoft/Simulation/Detector/include-MTrigger/MGTriggerSignal.hxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/include-MTrigger/MGTriggerSignal.hxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/include-MTrigger/MGTriggerSignal.hxx (revision 5099) @@ -4,5 +4,5 @@ #include -#include +#include #include Index: trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx (revision 5099) @@ -13,4 +13,6 @@ #include "MGeomCam.h" #include "MGeomPix.h" + +using namespace std; MTrigger::MTrigger(int pix) { @@ -1266,5 +1268,5 @@ ii=(Int_t)i/8; if (dknt[i]==kTRUE){ - map[ii]=map[ii]+(Int_t)pow(2,i-ii*8); + map[ii]=map[ii]+(Int_t)pow((double)2, (double)i-ii*8); } } Index: trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx =================================================================== --- trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx (revision 5097) +++ trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx (revision 5099) @@ -15,5 +15,5 @@ // // -#include +#include #include