diff --git a/vmc/inc/TGeoMCGeometry.h b/vmc/inc/TGeoMCGeometry.h index a503782e63f481d8b7b3686f2690553f880bd0b5..b93a804e305c4547f578ff7640d2c53477ecbb55 100644 --- a/vmc/inc/TGeoMCGeometry.h +++ b/vmc/inc/TGeoMCGeometry.h @@ -1,4 +1,4 @@ -// @(#)root/vmc:$Name: $:$Id: TGeoMCGeometry.h,v 1.5 2004/05/14 09:45:07 brun Exp $ +// @(#)root/vmc:$Name: $:$Id: TGeoMCGeometry.h,v 1.6 2004/10/12 07:45:53 brun Exp $ // Authors: ... 25/06/2002 #ifndef ROOT_TGeoMCGeometry @@ -7,7 +7,7 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -/* $Id: TGeoMCGeometry.h,v 1.5 2004/05/14 09:45:07 brun Exp $ */ +/* $Id: TGeoMCGeometry.h,v 1.6 2004/10/12 07:45:53 brun Exp $ */ // // Class TGeoMCGeometry @@ -40,14 +40,14 @@ class TGeoMCGeometry : public TVirtualMCGeometry { virtual void Medium(Int_t& kmed, const char *name, Int_t nmat, Int_t isvol, Int_t ifield, Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Float_t* ubuf, Int_t nbuf); + Double_t stmin, Float_t* ubuf, Int_t nbuf); virtual void Medium(Int_t& kmed, const char *name, Int_t nmat, Int_t isvol, Int_t ifield, Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Double_t* ubuf, Int_t nbuf); + Double_t stmin, Double_t* ubuf, Int_t nbuf); virtual void Matrix(Int_t& krot, Double_t thetaX, Double_t phiX, Double_t thetaY, Double_t phiY, Double_t thetaZ, - Double_t phiZ); + Double_t phiZ); // functions from GGEOM virtual Int_t Gsvolu(const char *name, const char *shape, Int_t nmed, @@ -84,7 +84,7 @@ class TGeoMCGeometry : public TVirtualMCGeometry { // Euclid //virtual void WriteEuclid(const char*, const char*, Int_t, Int_t); - + // get methods virtual Int_t VolId(const Text_t* volName) const; virtual const char* VolName(Int_t id) const; diff --git a/vmc/inc/TVirtualMC.h b/vmc/inc/TVirtualMC.h index 8973ef90537391af08e43a8f7a5a7b3ab3cb79a5..981c038c73ab11c2a8844d2531fcb5b86cc78d66 100644 --- a/vmc/inc/TVirtualMC.h +++ b/vmc/inc/TVirtualMC.h @@ -1,4 +1,4 @@ -// @(#)root/vmc:$Name: $:$Id: TVirtualMC.h,v 1.12 2005/05/17 12:44:52 brun Exp $ +// @(#)root/vmc:$Name: $:$Id: TVirtualMC.h,v 1.13 2005/05/19 09:03:48 brun Exp $ // Authors: Ivana Hrivnacova, Rene Brun, Federico Carminati 13/04/2002 #ifndef ROOT_TVirtualMC @@ -48,11 +48,11 @@ class TVirtualMC : public TNamed { // functions from GCONS virtual void Gfmate(Int_t imat, char *name, Float_t &a, Float_t &z, - Float_t &dens, Float_t &radl, Float_t &absl, - Float_t* ubuf, Int_t& nbuf) = 0; + Float_t &dens, Float_t &radl, Float_t &absl, + Float_t* ubuf, Int_t& nbuf) = 0; virtual void Gfmate(Int_t imat, char *name, Double_t &a, Double_t &z, - Double_t &dens, Double_t &radl, Double_t &absl, - Double_t* ubuf, Int_t& nbuf) = 0; + Double_t &dens, Double_t &radl, Double_t &absl, + Double_t* ubuf, Int_t& nbuf) = 0; virtual void Gckmat(Int_t imed, char* name) = 0; // detector composition @@ -69,14 +69,14 @@ class TVirtualMC : public TNamed { virtual void Medium(Int_t& kmed, const char *name, Int_t nmat, Int_t isvol, Int_t ifield, Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Float_t* ubuf, Int_t nbuf) = 0; + Double_t stmin, Float_t* ubuf, Int_t nbuf) = 0; virtual void Medium(Int_t& kmed, const char *name, Int_t nmat, Int_t isvol, Int_t ifield, Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Double_t* ubuf, Int_t nbuf) = 0; + Double_t stmin, Double_t* ubuf, Int_t nbuf) = 0; virtual void Matrix(Int_t& krot, Double_t thetaX, Double_t phiX, Double_t thetaY, Double_t phiY, Double_t thetaZ, - Double_t phiZ) = 0; + Double_t phiZ) = 0; virtual void Gstpar(Int_t itmed, const char *param, Double_t parval) = 0; // functions from GGEOM @@ -113,40 +113,40 @@ class TVirtualMC : public TNamed { // and material properties for optical physics virtual void DefineOpSurface(const char* name, EMCOpSurfaceModel model, - EMCOpSurfaceType surfaceType, - EMCOpSurfaceFinish surfaceFinish, - Double_t sigmaAlpha); + EMCOpSurfaceType surfaceType, + EMCOpSurfaceFinish surfaceFinish, + Double_t sigmaAlpha); virtual void SetBorderSurface(const char* name, const char* vol1Name, int vol1CopyNo, const char* vol2Name, int vol2CopyNo, - const char* opSurfaceName); + const char* opSurfaceName); virtual void SetSkinSurface(const char* name, const char* volName, - const char* opSurfaceName); + const char* opSurfaceName); virtual void SetMaterialProperty( Int_t itmed, const char* propertyName, - Int_t np, Double_t* pp, Double_t* values); + Int_t np, Double_t* pp, Double_t* values); virtual void SetMaterialProperty( Int_t itmed, const char* propertyName, - Double_t value); + Double_t value); virtual void SetMaterialProperty( const char* surfaceName, const char* propertyName, - Int_t np, Double_t* pp, Double_t* values); + Int_t np, Double_t* pp, Double_t* values); // functions for drawing // to be removed with complete move to TGeo virtual void DrawOneSpec(const char* name) = 0; virtual void Gsatt(const char* name, const char* att, Int_t val) = 0; virtual void Gdraw(const char*,Double_t theta = 30, Double_t phi = 30, - Double_t psi = 0, Double_t u0 = 10, Double_t v0 = 10, - Double_t ul = 0.01, Double_t vl = 0.01) = 0; + Double_t psi = 0, Double_t u0 = 10, Double_t v0 = 10, + Double_t ul = 0.01, Double_t vl = 0.01) = 0; // Euclid virtual void WriteEuclid(const char*, const char*, Int_t, Int_t) = 0; // set geometry from Root (built via TGeo) virtual void SetRootGeometry() = 0; - + // get methods virtual Int_t VolId(const Text_t* volName) const = 0; virtual const char* VolName(Int_t id) const = 0; @@ -176,10 +176,10 @@ class TVirtualMC : public TNamed { virtual Int_t PDGFromId(Int_t pdg) const =0; // get methods - virtual TString ParticleName(Int_t pdg) const = 0; - virtual Double_t ParticleMass(Int_t pdg) const = 0; - virtual Double_t ParticleCharge(Int_t pdg) const = 0; - virtual Double_t ParticleLifeTime(Int_t pdg) const = 0; + virtual TString ParticleName(Int_t pdg) const = 0; + virtual Double_t ParticleMass(Int_t pdg) const = 0; + virtual Double_t ParticleCharge(Int_t pdg) const = 0; + virtual Double_t ParticleLifeTime(Int_t pdg) const = 0; virtual TMCParticleType ParticleMCType(Int_t pdg) const = 0; // @@ -307,39 +307,39 @@ class TVirtualMC : public TNamed { inline void TVirtualMC::DefineOpSurface(const char* /*name*/, EMCOpSurfaceModel /*model*/, EMCOpSurfaceType /*surfaceType*/, - EMCOpSurfaceFinish /*surfaceFinish*/, Double_t /*sigmaAlpha*/) { + EMCOpSurfaceFinish /*surfaceFinish*/, Double_t /*sigmaAlpha*/) { Warning("DefineOpSurface", "New function - not yet implemented."); } - + inline void TVirtualMC::SetBorderSurface(const char* /*name*/, const char* /*vol1Name*/, int /*vol1CopyNo*/, const char* /*vol2Name*/, int /*vol2CopyNo*/, - const char* /*opSurfaceName*/) { + const char* /*opSurfaceName*/) { Warning("SetBorderSurface", "New function - not yet implemented."); } - + inline void TVirtualMC::SetSkinSurface(const char* /*name*/, const char* /*volName*/, - const char* /*opSurfaceName*/) { + const char* /*opSurfaceName*/) { Warning("SetSkinSurface", "New function - not yet implemented."); } - + inline void TVirtualMC::SetMaterialProperty( Int_t /*itmed*/, const char* /*propertyName*/, - Int_t /*np*/, Double_t* /*pp*/, Double_t* /*values*/) { + Int_t /*np*/, Double_t* /*pp*/, Double_t* /*values*/) { Warning("SetMaterialProperty", "New function - not yet implemented."); } - + inline void TVirtualMC::SetMaterialProperty( Int_t /*itmed*/, const char* /*propertyName*/, - Double_t /*value*/) { + Double_t /*value*/) { Warning("SetMaterialProperty", "New function - not yet implemented."); } - + inline void TVirtualMC::SetMaterialProperty( const char* /*surfaceName*/, const char* /*propertyName*/, - Int_t /*np*/, Double_t* /*pp*/, Double_t* /*values*/) { + Int_t /*np*/, Double_t* /*pp*/, Double_t* /*values*/) { Warning("SetMaterialProperty", "New function - not yet implemented."); } diff --git a/vmc/inc/TVirtualMCGeometry.h b/vmc/inc/TVirtualMCGeometry.h index 0403e9198fdcf69fc86d650490b036ee1ef281a7..1883d2129afe7a162aa964e34b24ae1f4951f2ea 100644 --- a/vmc/inc/TVirtualMCGeometry.h +++ b/vmc/inc/TVirtualMCGeometry.h @@ -1,4 +1,4 @@ -// @(#)root/vmc:$Name: $:$Id: TVirtualMCGeometry.h,v 1.3 2003/09/23 14:03:15 brun Exp $ +// @(#)root/vmc:$Name: $:$Id: TVirtualMCGeometry.h,v 1.4 2004/10/12 07:45:53 brun Exp $ // Authors: ... 25/06/2002 #ifndef ROOT_TVirtualMCGeometry @@ -36,14 +36,14 @@ class TVirtualMCGeometry : public TNamed { virtual void Medium(Int_t& kmed, const char *name, Int_t nmat, Int_t isvol, Int_t ifield, Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Float_t* ubuf, Int_t nbuf) = 0; + Double_t stmin, Float_t* ubuf, Int_t nbuf) = 0; virtual void Medium(Int_t& kmed, const char *name, Int_t nmat, Int_t isvol, Int_t ifield, Double_t fieldm, Double_t tmaxfd, Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Double_t* ubuf, Int_t nbuf) = 0; + Double_t stmin, Double_t* ubuf, Int_t nbuf) = 0; virtual void Matrix(Int_t& krot, Double_t thetaX, Double_t phiX, Double_t thetaY, Double_t phiY, Double_t thetaZ, - Double_t phiZ) = 0; + Double_t phiZ) = 0; // functions from GGEOM virtual Int_t Gsvolu(const char *name, const char *shape, Int_t nmed, @@ -79,7 +79,7 @@ class TVirtualMCGeometry : public TNamed { // Euclid // virtual void WriteEuclid(const char*, const char*, Int_t, Int_t) = 0; - + // get methods virtual Int_t VolId(const Text_t* volName) const = 0; virtual const char* VolName(Int_t id) const = 0; @@ -88,7 +88,7 @@ class TVirtualMCGeometry : public TNamed { virtual const char* VolDaughterName(const char* volName, Int_t i) const; virtual Int_t VolDaughterCopyNo(const char* volName, Int_t i) const; // New functions - // Make them = 0 with the next release + // Make them = 0 with the next release virtual Int_t VolId2Mate(Int_t id) const = 0; protected: diff --git a/vmc/inc/TVirtualMCStack.h b/vmc/inc/TVirtualMCStack.h index 0aa3bd521949ab77ee48735623f8d663027b57f3..8c7811bf80a5068db030cc3082f811e3e3f457ee 100644 --- a/vmc/inc/TVirtualMCStack.h +++ b/vmc/inc/TVirtualMCStack.h @@ -1,4 +1,4 @@ -// @(#)root/vmc:$Name: $:$Id: TVirtualMCStack.h,v 1.1 2003/07/15 09:56:58 brun Exp $ +// @(#)root/vmc:$Name: $:$Id: TVirtualMCStack.h,v 1.2 2003/09/23 14:03:15 brun Exp $ // Authors: Ivana Hrivnacova 13/04/2002 #ifndef ROOT_TVirtualMCStack @@ -43,9 +43,9 @@ public: virtual void PushTrack(Int_t toBeDone, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, - Double_t polx, Double_t poly, Double_t polz, - TMCProcess mech, Int_t& ntr, Double_t weight, - Int_t is) = 0; + Double_t polx, Double_t poly, Double_t polz, + TMCProcess mech, Int_t& ntr, Double_t weight, + Int_t is) = 0; // The stack has to provide two pop mechanisms: // PopNextTrack() - pops all particles with toBeDone = 1, diff --git a/vmc/src/TGeoMCGeometry.cxx b/vmc/src/TGeoMCGeometry.cxx index a3efd1793d9d31f36bfec1add23546dd6b2013c8..f08fb5b807e5616874254ac2bda41641bcfce66d 100644 --- a/vmc/src/TGeoMCGeometry.cxx +++ b/vmc/src/TGeoMCGeometry.cxx @@ -1,4 +1,4 @@ -// @(#)root/mc:$Name: $:$Id: TGeoMCGeometry.cxx,v 1.4 2004/03/19 17:42:47 brun Exp $ +// @(#)root/mc:$Name: $:$Id: TGeoMCGeometry.cxx,v 1.5 2004/10/12 07:45:54 brun Exp $ // Authors: ... 25/06/2002 //______________________________________________________________________________ @@ -107,8 +107,8 @@ void TGeoMCGeometry::Vname(const char *name, char *vname) const //_____________________________________________________________________________ void TGeoMCGeometry::Material(Int_t& kmat, const char* name, Double_t a, Double_t z, - Double_t dens, Double_t radl, Double_t absl, Float_t* buf, - Int_t nwbuf) + Double_t dens, Double_t radl, Double_t absl, Float_t* buf, + Int_t nwbuf) { // // Defines a Material @@ -135,8 +135,8 @@ void TGeoMCGeometry::Material(Int_t& kmat, const char* name, Double_t a, Double_ //_____________________________________________________________________________ void TGeoMCGeometry::Material(Int_t& kmat, const char* name, Double_t a, Double_t z, - Double_t dens, Double_t radl, Double_t absl, Double_t* /*buf*/, - Int_t /*nwbuf*/) + Double_t dens, Double_t radl, Double_t absl, Double_t* /*buf*/, + Int_t /*nwbuf*/) { // // Defines a Material @@ -161,7 +161,7 @@ void TGeoMCGeometry::Material(Int_t& kmat, const char* name, Double_t a, Double_ //_____________________________________________________________________________ void TGeoMCGeometry::Mixture(Int_t& kmat, const char* name, Float_t* a, Float_t* z, - Double_t dens, Int_t nlmat, Float_t* wmat) + Double_t dens, Int_t nlmat, Float_t* wmat) { // // Defines mixture OR COMPOUND IMAT as composed by @@ -192,7 +192,7 @@ void TGeoMCGeometry::Mixture(Int_t& kmat, const char* name, Float_t* a, Float_t* //_____________________________________________________________________________ void TGeoMCGeometry::Mixture(Int_t& kmat, const char* name, Double_t* a, Double_t* z, - Double_t dens, Int_t nlmat, Double_t* wmat) + Double_t dens, Int_t nlmat, Double_t* wmat) { // // Defines mixture OR COMPOUND IMAT as composed by @@ -223,9 +223,9 @@ void TGeoMCGeometry::Mixture(Int_t& kmat, const char* name, Double_t* a, Double_ //_____________________________________________________________________________ void TGeoMCGeometry::Medium(Int_t& kmed, const char* name, Int_t nmat, Int_t isvol, - Int_t ifield, Double_t fieldm, Double_t tmaxfd, - Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Float_t* ubuf, Int_t nbuf) + Int_t ifield, Double_t fieldm, Double_t tmaxfd, + Double_t stemax, Double_t deemax, Double_t epsil, + Double_t stmin, Float_t* ubuf, Int_t nbuf) { // // kmed tracking medium number assigned @@ -249,14 +249,14 @@ void TGeoMCGeometry::Medium(Int_t& kmed, const char* name, Int_t nmat, Int_t isv Double_t* dubuf = CreateDoubleArray(ubuf, nbuf); Medium(kmed, name, nmat, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin, dubuf, nbuf); - delete [] dubuf; + delete [] dubuf; } //_____________________________________________________________________________ void TGeoMCGeometry::Medium(Int_t& kmed, const char* name, Int_t nmat, Int_t isvol, - Int_t ifield, Double_t fieldm, Double_t tmaxfd, - Double_t stemax, Double_t deemax, Double_t epsil, - Double_t stmin, Double_t* /*ubuf*/, Int_t /*nbuf*/) + Int_t ifield, Double_t fieldm, Double_t tmaxfd, + Double_t stemax, Double_t deemax, Double_t epsil, + Double_t stmin, Double_t* /*ubuf*/, Int_t /*nbuf*/) { // // kmed tracking medium number assigned @@ -281,7 +281,7 @@ void TGeoMCGeometry::Medium(Int_t& kmed, const char* name, Int_t nmat, Int_t isv //_____________________________________________________________________________ void TGeoMCGeometry::Matrix(Int_t& krot, Double_t thex, Double_t phix, Double_t they, - Double_t phiy, Double_t thez, Double_t phiz) + Double_t phiy, Double_t thez, Double_t phiz) { // // krot rotation matrix number assigned @@ -301,7 +301,7 @@ void TGeoMCGeometry::Matrix(Int_t& krot, Double_t thex, Double_t phix, Double_t //_____________________________________________________________________________ Int_t TGeoMCGeometry::Gsvolu(const char *name, const char *shape, Int_t nmed, - Float_t *upar, Int_t npar) + Float_t *upar, Int_t npar) { // // NAME Volume name @@ -321,7 +321,7 @@ Int_t TGeoMCGeometry::Gsvolu(const char *name, const char *shape, Int_t nmed, //_____________________________________________________________________________ Int_t TGeoMCGeometry::Gsvolu(const char *name, const char *shape, Int_t nmed, - Double_t *upar, Int_t npar) + Double_t *upar, Int_t npar) { // // NAME Volume name @@ -344,7 +344,7 @@ Int_t TGeoMCGeometry::Gsvolu(const char *name, const char *shape, Int_t nmed, //_____________________________________________________________________________ void TGeoMCGeometry::Gsdvn(const char *name, const char *mother, Int_t ndiv, - Int_t iaxis) + Int_t iaxis) { // // Create a new volume by dividing an existing one @@ -367,7 +367,7 @@ void TGeoMCGeometry::Gsdvn(const char *name, const char *mother, Int_t ndiv, //_____________________________________________________________________________ void TGeoMCGeometry::Gsdvn2(const char *name, const char *mother, Int_t ndiv, - Int_t iaxis, Double_t c0i, Int_t numed) + Int_t iaxis, Double_t c0i, Int_t numed) { // // Create a new volume by dividing an existing one @@ -385,7 +385,7 @@ void TGeoMCGeometry::Gsdvn2(const char *name, const char *mother, Int_t ndiv, } //_____________________________________________________________________________ void TGeoMCGeometry::Gsdvt(const char *name, const char *mother, Double_t step, - Int_t iaxis, Int_t numed, Int_t /*ndvmx*/) + Int_t iaxis, Int_t numed, Int_t /*ndvmx*/) { // // Create a new volume by dividing an existing one @@ -408,7 +408,7 @@ void TGeoMCGeometry::Gsdvt(const char *name, const char *mother, Double_t step, //_____________________________________________________________________________ void TGeoMCGeometry::Gsdvt2(const char *name, const char *mother, Double_t step, - Int_t iaxis, Double_t c0, Int_t numed, Int_t /*ndvmx*/) + Int_t iaxis, Double_t c0, Int_t numed, Int_t /*ndvmx*/) { // // Create a new volume by dividing an existing one @@ -452,7 +452,7 @@ void TGeoMCGeometry::Gsord(const char * /*name*/, Int_t /*iax*/) //_____________________________________________________________________________ void TGeoMCGeometry::Gspos(const char *name, Int_t nr, const char *mother, Double_t x, - Double_t y, Double_t z, Int_t irot, const char *konly) + Double_t y, Double_t z, Int_t irot, const char *konly) { // // Position a volume into an existing one @@ -484,8 +484,8 @@ void TGeoMCGeometry::Gspos(const char *name, Int_t nr, const char *mother, Doub //_____________________________________________________________________________ void TGeoMCGeometry::Gsposp(const char *name, Int_t nr, const char *mother, - Double_t x, Double_t y, Double_t z, Int_t irot, - const char *konly, Float_t *upar, Int_t np ) + Double_t x, Double_t y, Double_t z, Int_t irot, + const char *konly, Float_t *upar, Int_t np ) { // // Place a copy of generic volume NAME with user number @@ -499,8 +499,8 @@ void TGeoMCGeometry::Gsposp(const char *name, Int_t nr, const char *mother, //_____________________________________________________________________________ void TGeoMCGeometry::Gsposp(const char *name, Int_t nr, const char *mother, - Double_t x, Double_t y, Double_t z, Int_t irot, - const char *konly, Double_t *upar, Int_t np ) + Double_t x, Double_t y, Double_t z, Int_t irot, + const char *konly, Double_t *upar, Int_t np ) { // // Place a copy of generic volume NAME with user number diff --git a/vmc/src/TMCVerbose.cxx b/vmc/src/TMCVerbose.cxx index e47f405c732ced64ea703dea7a7d8fb6b65fe62d..8a35a210b546bc4c5f70603a3b6e2dda0355cf5e 100644 --- a/vmc/src/TMCVerbose.cxx +++ b/vmc/src/TMCVerbose.cxx @@ -1,4 +1,4 @@ -// @(#)root/vmc:$Name: v4-04-02 $:$Id: TMCVerbose.cxx,v 1.2 2003/09/23 14:03:15 brun Exp $ +// @(#)root/vmc:$Name: $:$Id: TMCVerbose.cxx,v 1.3 2005/05/17 12:44:52 brun Exp $ // Author: Ivana Hrivnacova, 27/03/2002 #include "Riostream.h" @@ -256,9 +256,9 @@ void TMCVerbose::Stepping() Double_t x, y, z; gMC->TrackPosition(x, y, z); cout << setw(8) << setprecision(3) << x << " " - << setw(8) << setprecision(3) << y << " " - << setw(8) << setprecision(3) << z << " "; - + << setw(8) << setprecision(3) << y << " " + << setw(8) << setprecision(3) << z << " "; + // Kinetic energy // Double_t px, py, pz, etot; @@ -273,7 +273,7 @@ void TMCVerbose::Stepping() // Step length // cout << setw(8) << setprecision(3) << gMC->TrackStep() << " "; - + // Track length // cout << setw(8) << setprecision(3) << gMC->TrackLength() << " ";