Introducing glvolu in the interface

diff --git a/TGeant3/TGeant3.cxx b/TGeant3/TGeant3.cxx
index 498ee8c44b197892c627049c6a9a4cde41ddcf22..49ffe9916576868b61bf9841bebb62aaec9a691e 100644 (file)
--- a/TGeant3/TGeant3.cxx
+++ b/TGeant3/TGeant3.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.35  2000/09/12 14:27:10  morsch
+No instance of AliDecayer created to initialize fDecayer.
+

 Revision 1.34  2000/09/07 12:12:01  morsch
 Comment inside comment removed.
 
 Revision 1.34  2000/09/07 12:12:01  morsch
 Comment inside comment removed.
 


@@ -192,6 +195,7 @@ Introduction of the Copyright and cvs Log
 # define gfpara  gfpara_
 # define gckpar  gckpar_
 # define gckmat  gckmat_
 # define gfpara  gfpara_
 # define gckpar  gckpar_
 # define gckmat  gckmat_

+# define glvolu  glvolu_

 # define geditv  geditv_
 # define mzdrop  mzdrop_
 
 # define geditv  geditv_
 # define mzdrop  mzdrop_
 


@@ -290,6 +294,7 @@ Introduction of the Copyright and cvs Log
 # define gfpara  GFPARA
 # define gckpar  GCKPAR
 # define gckmat  GCKMAT
 # define gfpara  GFPARA
 # define gckpar  GCKPAR
 # define gckmat  GCKMAT

+# define glvolu  GLVOLU

 # define geditv  GEDITV
 # define mzdrop  MZDROP 
 
 # define geditv  GEDITV
 # define mzdrop  MZDROP 
 


@@ -472,6 +477,8 @@ extern "C"
 
   void type_of_call gckmat(Int_t&, DEFCHARD DEFCHARL);
 
 
   void type_of_call gckmat(Int_t&, DEFCHARD DEFCHARL);
 

+  void type_of_call glvolu(Int_t&, Int_t*, Int_t*, Int_t&);
+

   void type_of_call gprint(DEFCHARD,const int& DEFCHARL); 
 
   void type_of_call gdinit(); 
   void type_of_call gprint(DEFCHARD,const int& DEFCHARL); 
 
   void type_of_call gdinit(); 


@@ -2913,6 +2920,31 @@ void TGeant3::Gckmat(Int_t itmed, char* natmed)
   gckmat(itmed, PASSCHARD(natmed) PASSCHARL(natmed));
 }
 
   gckmat(itmed, PASSCHARD(natmed) PASSCHARL(natmed));
 }
 

+//_____________________________________________________________________________
+Int_t TGeant3::Glvolu(Int_t nlev, Int_t *lnam,Int_t *lnum) 
+{ 
+  //
+  //  nlev   number of leveles deap into the volume tree
+  //         size of the arrays lnam and lnum
+  //  lnam   an integer array whos 4 bytes contain the askii code for the
+  //         volume names
+  //  lnum   an integer array containing the copy numbers for that specific
+  //         volume
+  //
+  //  This routine fills the volulme paramters in common /gcvolu/ for a
+  //  physical tree, specified by the list lnam and lnum of volume names
+  //  and numbers, and for all its ascendants up to level 1. This routine
+  //  is optimsed and does not re-compute the part of the history already
+  //  available in GCVOLU. This means that if it is used in user programs
+  //  outside the usual framwork of the tracking, the user has to initilise
+  //  to zero NLEVEL in the common GCVOLU. It return 0 if there were no
+  //  problems in make the call.
+  //
+  Int_t ier;
+  glvolu(nlev, lnam, lnum, ier); 
+  return ier;
+}
+

 //_____________________________________________________________________________
 void TGeant3::Gdelete(Int_t iview)
 { 
 //_____________________________________________________________________________
 void TGeant3::Gdelete(Int_t iview)
 { 

diff --git a/TGeant3/TGeant3.h b/TGeant3/TGeant3.h
index fe94eee2e7d553b19954a11e95d8b404a978d9f9..9c9e0afa420fcc8ffac3207bad9be33ba3a1547f 100644 (file)
--- a/TGeant3/TGeant3.h
+++ b/TGeant3/TGeant3.h
@@ -759,6 +759,7 @@ public:
                         Int_t& natt, Float_t* par, Float_t* att);
    virtual  void  Gckpar(Int_t ish, Int_t npar, Float_t *par);
    virtual  void  Gckmat(Int_t itmed, char *natmed);
                         Int_t& natt, Float_t* par, Float_t* att);
    virtual  void  Gckpar(Int_t ish, Int_t npar, Float_t *par);
    virtual  void  Gckmat(Int_t itmed, char *natmed);

+   virtual  Int_t Glvolu(Int_t nlev, Int_t *lnam,Int_t *lnum);

     
       // functions from GDRAW 
    virtual  void  DefaultRange();
     
       // functions from GDRAW 
    virtual  void  DefaultRange();

diff --git a/TGeant3/TGeant3Dummy.cxx b/TGeant3/TGeant3Dummy.cxx
index b20350e2c465a4ccf2d4ccafd9a2aac0da678b93..047804188ccca3b2dbcf211872e5b88dd1bbf93d 100644 (file)
--- a/TGeant3/TGeant3Dummy.cxx
+++ b/TGeant3/TGeant3Dummy.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.23  2000/07/12 08:56:32  fca
+Coding convention correction and warning removal
+

 Revision 1.22  2000/07/11 18:25:00  fca
 Coding convention corrections + few minor bug fixes
 
 Revision 1.22  2000/07/11 18:25:00  fca
 Coding convention corrections + few minor bug fixes
 


@@ -237,6 +240,7 @@ void  TGeant3::Gsatt(const char*, const char*, Int_t) {}
 void  TGeant3::Gfpara(const char*, Int_t, Int_t, Int_t&, Int_t&, Float_t*, Float_t*) {}
 void  TGeant3::Gckpar(Int_t, Int_t, Float_t*) {}
 void  TGeant3::Gckmat(Int_t, char*) {}
 void  TGeant3::Gfpara(const char*, Int_t, Int_t, Int_t&, Int_t&, Float_t*, Float_t*) {}
 void  TGeant3::Gckpar(Int_t, Int_t, Float_t*) {}
 void  TGeant3::Gckmat(Int_t, char*) {}

+Int_t TGeant3::Glvolu(Int_t, Int_t*, Int_t*) {return 0;}

 void  TGeant3::BuildPhysics() {}
 
 //______________________________________________________________________________
 void  TGeant3::BuildPhysics() {}
 
 //______________________________________________________________________________