Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 571) +++ trunk/MagicSoft/Mars/Changelog (revision 574) @@ -1,3 +1,28 @@ -*-*- END -*-*- + 2000/01/18: Thomas Bretz + + * Makefile: + - mmc-library added + + * Makefile.conf.general: + - Added definition of __MARS__ + + * Makefile.rules: + - Added definitions to rootcint + + * Oscar added the McFormat subdir of the Monte Carlo as mmc + + * mmc/MMcEvt.h: + - renamed to MMcEvt.hxx + + * mmc/*.hxx: + - added necessary defintions from MDefineTrigger.h + + * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt: + - added + + * mmc/LinkDef.h: + - removed + 2000/01/17: Thomas Bretz Index: trunk/MagicSoft/Mars/Makefile =================================================================== --- trunk/MagicSoft/Mars/Makefile (revision 571) +++ trunk/MagicSoft/Mars/Makefile (revision 574) @@ -35,5 +35,5 @@ # ----->>> mars libraries # -SUBDIRS = mgui mdatacheck mbase mraw +SUBDIRS = mgui mdatacheck mbase mraw mmc LIBRARIES = $(SUBDIRS:=.a) @@ -90,4 +90,7 @@ @cd mdatacheck; make mrproper; cd .. @echo "cd .." + @echo "cd mmc" + @cd mmc; make mrproper; cd .. + @echo "cd .." Index: trunk/MagicSoft/Mars/Makefile.conf.general =================================================================== --- trunk/MagicSoft/Mars/Makefile.conf.general (revision 571) +++ trunk/MagicSoft/Mars/Makefile.conf.general (revision 574) @@ -11,5 +11,7 @@ # -CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) +DEFINES = -D__MARS__ + +CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES) CFLAGS = $(CXXFLAGS) FFLAGS = $(CXXFLAGS) Index: trunk/MagicSoft/Mars/Makefile.rules =================================================================== --- trunk/MagicSoft/Mars/Makefile.rules (revision 571) +++ trunk/MagicSoft/Mars/Makefile.rules (revision 574) @@ -13,5 +13,5 @@ $(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \ - -c $(INCLUDES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h + -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h .cxx.o: Index: trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx (revision 571) +++ trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx (revision 574) @@ -11,5 +11,12 @@ #include "TObject.h" +#ifndef __MARS__ #include "../../Simulation/Detector/include-MTrigger/MTriggerDefine.h" +#else +// +// From the include file above +// +#define TRIGGER_PIXELS 271 +#endif class MHeaderTrig : public TObject { Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx (revision 571) +++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx (revision 574) @@ -1,4 +1,4 @@ #include -#include "MMcEvt.h" +#include "MMcEvt.hxx" Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.h =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.h (revision 571) +++ (revision ) @@ -1,108 +1,0 @@ -#ifndef __MMcEvt__ -#define __MMcEvt__ - -#include -#include -#include -#include -#include - -#include -#include "TObject.h" - - -class MMcEvt : public TObject { - private: - UShort_t usPartId; // Type of particle - Float_t fEnergy; // Energy in GeV - - Float_t fTheta; // Theta angle of event - Float_t fPhi; // Phi angle of event - - Float_t fCoreD; // Core d pos - Float_t fCoreX; // Core x pos - Float_t fCoreY; // Core y pos - Float_t fImpact; // impact parameter - - UShort_t usPhotIni; // Initial number of photons - UShort_t usPassPhotAtm; // Passed atmosphere - UShort_t usPassPhotRef; // Passed reflector - UShort_t usPassPhotCone; // Passed glas - UShort_t usPhotEl ; // Passed qe - - - public: - MMcEvt() ; - - MMcEvt( UShort_t, - Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, - UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ; - - ~MMcEvt(); - - void Clear(); - - void Fill( UShort_t, - Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, - UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ; - - - void Print(Option_t *); - - - - Short_t GetPartId() const { return usPartId; } //Get Type of particle - Float_t GetEnergy() const { return fEnergy; } //Get Energy - - Float_t GetTheta() const { return fTheta; } //Get Theta angle - Float_t GetPhi() const { return fPhi ; } //Get Phi angle - -/* Float_t GetCoreD() { return fCoreD; } //Get Core d pos */ -/* Float_t GetCoreX() { return fCoreX; } //Get Core x pos */ -/* Float_t GetCoreY() { return fCoreY; } //Get Core y pos */ - Float_t GetImpact() const { return fImpact;} //Get impact parameter - -/* Short_t GetPhotIni() { return usPhotIni; } //Get Initial photons */ -/* Short_t GetPassPhotAtm() { return usPassPhotAtm;} //Get Passed atmosphere */ -/* Short_t GetPassPhotRef() { return usPassPhotRef; } //Get Passed reflector */ -/* Short_t GetPassPhotCone() { return usPassPhotCone; } //Get Passed glas */ -/* Short_t GetPhotEl() { return usPhotEl; } //Get Passed qe */ - - - - /* void SetPartId(Short_t PartId) */ -/* { usPartId=PartId; } //Set Type of particle */ -/* void SetEnergy(Float_t Energy) */ -/* { fEnergy=Energy; } //Set Energy */ - -/* void SetTheta(Float_t Theta) */ -/* { fTheta=Theta; } //Set Theta angle */ -/* void SetPhi(Float_t Phi) */ -/* { fPhi=Phi; } //Set Phi angle */ - -/* void SetCoreD(Float_t CoreD) */ -/* { fCoreD=CoreD; } //Set Core d pos */ -/* void SetCoreX(Float_t CoreX) */ -/* { fCoreX=CoreX; } //Set Core x pos */ -/* void SetCoreY(Float_t CoreY ) */ -/* { fCoreY=CoreY; } //Set Core y pos */ -/* void SetImpact(Float_t Impact) */ -/* { fImpact=Impact;} //Set impact parameter */ - -/* void SetPhotIni(Short_t PhotIni) */ -/* { usPhotIni=PhotIni; } //Set Initial photons */ -/* void SetPassPhotAtm(Short_t PassPhotAtm) */ -/* { usPassPhotAtm=PassPhotAtm;} //Set Passed atmosphere */ -/* void SetPassPhotRef(Short_t PassPhotRef) */ -/* { usPassPhotRef=PassPhotRef ; } //Set Passed reflector */ -/* void SetPassPhotCone(Short_t PhotCon) */ -/* { usPassPhotCone=PhotCon; } //Set Passed glas */ -/* void SetPhotEl(Short_t PhotEl) */ -/* { usPhotEl=PhotEl; } //Set Passed qe */ - - - ClassDef(MMcEvt, 1) //Stores Montecarlo Information - -}; - -#endif Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx (revision 574) +++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx (revision 574) @@ -0,0 +1,108 @@ +#ifndef __MMcEvt__ +#define __MMcEvt__ + +#include +#include +#include +#include +#include + +#include +#include "TObject.h" + + +class MMcEvt : public TObject { + private: + UShort_t usPartId; // Type of particle + Float_t fEnergy; // Energy in GeV + + Float_t fTheta; // Theta angle of event + Float_t fPhi; // Phi angle of event + + Float_t fCoreD; // Core d pos + Float_t fCoreX; // Core x pos + Float_t fCoreY; // Core y pos + Float_t fImpact; // impact parameter + + UShort_t usPhotIni; // Initial number of photons + UShort_t usPassPhotAtm; // Passed atmosphere + UShort_t usPassPhotRef; // Passed reflector + UShort_t usPassPhotCone; // Passed glas + UShort_t usPhotEl ; // Passed qe + + + public: + MMcEvt() ; + + MMcEvt( UShort_t, + Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, + UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ; + + ~MMcEvt(); + + void Clear(); + + void Fill( UShort_t, + Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, + UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ; + + + void Print(Option_t *); + + + + Short_t GetPartId() const { return usPartId; } //Get Type of particle + Float_t GetEnergy() const { return fEnergy; } //Get Energy + + Float_t GetTheta() const { return fTheta; } //Get Theta angle + Float_t GetPhi() const { return fPhi ; } //Get Phi angle + +/* Float_t GetCoreD() { return fCoreD; } //Get Core d pos */ +/* Float_t GetCoreX() { return fCoreX; } //Get Core x pos */ +/* Float_t GetCoreY() { return fCoreY; } //Get Core y pos */ + Float_t GetImpact() const { return fImpact;} //Get impact parameter + +/* Short_t GetPhotIni() { return usPhotIni; } //Get Initial photons */ +/* Short_t GetPassPhotAtm() { return usPassPhotAtm;} //Get Passed atmosphere */ +/* Short_t GetPassPhotRef() { return usPassPhotRef; } //Get Passed reflector */ +/* Short_t GetPassPhotCone() { return usPassPhotCone; } //Get Passed glas */ +/* Short_t GetPhotEl() { return usPhotEl; } //Get Passed qe */ + + + + /* void SetPartId(Short_t PartId) */ +/* { usPartId=PartId; } //Set Type of particle */ +/* void SetEnergy(Float_t Energy) */ +/* { fEnergy=Energy; } //Set Energy */ + +/* void SetTheta(Float_t Theta) */ +/* { fTheta=Theta; } //Set Theta angle */ +/* void SetPhi(Float_t Phi) */ +/* { fPhi=Phi; } //Set Phi angle */ + +/* void SetCoreD(Float_t CoreD) */ +/* { fCoreD=CoreD; } //Set Core d pos */ +/* void SetCoreX(Float_t CoreX) */ +/* { fCoreX=CoreX; } //Set Core x pos */ +/* void SetCoreY(Float_t CoreY ) */ +/* { fCoreY=CoreY; } //Set Core y pos */ +/* void SetImpact(Float_t Impact) */ +/* { fImpact=Impact;} //Set impact parameter */ + +/* void SetPhotIni(Short_t PhotIni) */ +/* { usPhotIni=PhotIni; } //Set Initial photons */ +/* void SetPassPhotAtm(Short_t PassPhotAtm) */ +/* { usPassPhotAtm=PassPhotAtm;} //Set Passed atmosphere */ +/* void SetPassPhotRef(Short_t PassPhotRef) */ +/* { usPassPhotRef=PassPhotRef ; } //Set Passed reflector */ +/* void SetPassPhotCone(Short_t PhotCon) */ +/* { usPassPhotCone=PhotCon; } //Set Passed glas */ +/* void SetPhotEl(Short_t PhotEl) */ +/* { usPhotEl=PhotEl; } //Set Passed qe */ + + + ClassDef(MMcEvt, 1) //Stores Montecarlo Information + +}; + +#endif Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx (revision 571) +++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx (revision 574) @@ -11,5 +11,14 @@ #include "TObject.h" +#ifndef __MARS__ #include "../../Simulation/Detector/include-MTrigger/MTriggerDefine.h" +#else +// +// From the include file above +// +#define TOTAL_TRIGGER_TIME 160 +#define LEVEL1_DEAD_TIME 50 +#define LEVEL2_DEAD_TIME 300 +#endif class MMcTrig : public TObject { Index: trunk/MagicSoft/include-Classes/MMcFormat/Makefile =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/Makefile (revision 574) +++ trunk/MagicSoft/include-Classes/MMcFormat/Makefile (revision 574) @@ -0,0 +1,52 @@ +################################################################## +# +# makefile +# +# for the MARS software +# +################################################################## +# @maintitle + +# @code + +# +# please change all system depend values in the +# config.mk.${OSTYPE} file +# +# +include ../Makefile.conf.$(OSTYPE) +include ../Makefile.conf.general + +# @endcode + +INCLUDES = -I. + +# @code + +CINT = Mc +LIB = mmc.a + +#------------------------------------------------------------------------------ + +.SUFFIXES: .c .cc .cxx .h .hxx .o + +SRCFILES = MHeaderTrig.cxx \ + MMcEvt.cxx \ + MMcTrig.cxx + +SRCS = $(SRCFILES) +HEADERS = $(SRCFILES:.cxx=.hxx) +OBJS = $(SRCFILES:.cxx=.o) + +############################################################ + +all: $(LIB) + +include ../Makefile.rules + +clean: rmlib rmcint rmobjs rmcore + +mrproper: clean rmbak + +# @endcode + Index: trunk/MagicSoft/include-Classes/MMcFormat/McIncl.h =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/McIncl.h (revision 574) +++ trunk/MagicSoft/include-Classes/MMcFormat/McIncl.h (revision 574) @@ -0,0 +1,3 @@ +#ifndef __CINT__ + +#endif // __CINT__ Index: trunk/MagicSoft/include-Classes/MMcFormat/McLinkDef.h =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/McLinkDef.h (revision 574) +++ trunk/MagicSoft/include-Classes/MMcFormat/McLinkDef.h (revision 574) @@ -0,0 +1,16 @@ +#ifdef __CINT__ +#define __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class MMcEvt; +#pragma link C++ class MMcTrig; +#pragma link C++ class MHeaderTrig; + +#endif + + + + Index: trunk/MagicSoft/include-Classes/MMcFormat/readme.txt =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/readme.txt (revision 574) +++ trunk/MagicSoft/include-Classes/MMcFormat/readme.txt (revision 574) @@ -0,0 +1,6 @@ + + Please be aware of that this subdirectory is used in two CVS modules. + + If you change something it can affect the Mars and/or Monte Carlo + code! +