Some additions to improve the compatibility with G4

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index 2a1d7f0876b884019fdb1a7576dc26009129b613..dbc1d3bbb6358bf8210282767357d11620b0a056 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -1,5 +1,5 @@
-#ifndef ALIMC_H
-#define ALIMC_H
+#ifndef ALI_MC_H
+#define ALI_MC_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //                                                                           //
-//    Generic interface to MC for AliRoot                                    //
+//    Abstract Monte Carlo interface                                          //
 //                                                                           //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,115 +18,182 @@
 
 class AliMC : public TNamed 
 {
+  public:
+    AliMC(const char *name, const char *title);
+    AliMC();
+    virtual ~AliMC() {}
+  
+    // static access method
+    static inline AliMC* GetMC();
 
-private:
-  static AliMC* fgMC;
-
-public:
-  AliMC(const char *name, const char *title);
-  AliMC();
-  virtual ~AliMC() {}
-  //Generic access functions
-  static inline AliMC* GetMC() {return fgMC;}
-  //
-  virtual void    FinishGeometry() = 0;
-  virtual Int_t   CurrentMaterial(Float_t &a, Float_t &z, Float_t &dens, Float_t &radl, Float_t &absl) const =0;
-  virtual Int_t   CurrentVolID(Int_t&) const =0;
-  virtual Int_t   CurrentVolOffID(Int_t, Int_t& ) const =0;
-  virtual const char* CurrentVolName() const =0;
-  virtual const char* CurrentVolOffName(Int_t) const =0;
-  virtual Int_t   NofVolumes() const =0;
-  virtual Int_t   VolId(Text_t*) const =0;
-  virtual Int_t   IdFromPDG(Int_t) const =0;
-  virtual Int_t   PDGFromId(Int_t) const =0;
-  virtual void    DefineParticles() = 0;
-  virtual void    TrackPosition(TLorentzVector&) const =0;
-  virtual void    TrackMomentum(TLorentzVector&) const =0;
-  virtual Float_t TrackCharge() const =0;
-  virtual Float_t TrackMass() const =0;
-  virtual Float_t TrackStep() const =0;
-  virtual Int_t   TrackPid() const =0;
-  virtual Bool_t  IsTrackInside() const =0;
-  virtual Bool_t  IsTrackEntering() const =0;
-  virtual Bool_t  IsTrackExiting() const =0;
-  virtual Bool_t  IsTrackOut() const =0;
-  virtual Bool_t  IsTrackDisappeared() const =0;
-  virtual Bool_t  IsTrackStop() const =0;
-  virtual Float_t TrackLength() const =0;
-  virtual Float_t TrackTime() const =0;
-  virtual Bool_t  IsTrackAlive() const=0;
-  virtual Int_t   NSecondaries() const=0;
-  virtual Int_t   CurrentEvent() const=0;
-  virtual const char*   ProdProcess() const=0;
-  virtual void    GetSecondary(Int_t, Int_t&, TLorentzVector&, TLorentzVector&)=0;
-  virtual void    StopTrack() =0;
-  virtual void    StopEvent() =0;
-  virtual Float_t MaxStep() const =0;
-  virtual void    SetMaxStep(Float_t ) =0;
-  virtual void    SetMaxNStep(Int_t) =0;
-  virtual Int_t   GetMaxNStep() const =0;
-  virtual void    SetUserDecay(Int_t) =0;
-  virtual Int_t   GetMedium() const =0;
-  virtual void    DrawOneSpec(const char*)=0;
-  virtual Float_t Edep() const =0;
-  virtual Float_t Etot() const =0;
-  virtual const char*   VolName(Int_t) const=0;
-  virtual Float_t Xsec(char*, Float_t, Int_t, Int_t)=0;
-  virtual void    Gstpar(Int_t, const char *, Float_t)=0;
-  virtual Int_t   Gsvolu(const char*, const char*, Int_t, Float_t*, Int_t)=0;
-  virtual void    Gsdvn(const char*, const char*, Int_t, Int_t)=0;
-  virtual void    Gsdvn2(const char*, const char*, Int_t, Int_t,
-                        Float_t, Int_t)=0;
-  virtual void    Gsdvt(const char*, const char*, Float_t, Int_t,
-                       Int_t, Int_t)=0; 
-  virtual  void   Gsdvt2(const char*, const char*, Float_t, Int_t,
-                        Float_t, Int_t, Int_t)=0; 
-  virtual  void   Gspos(const char*, Int_t, const char*, Float_t, Float_t,
-                       Float_t, Int_t, const char *konly="ONLY")=0; 
-  virtual  void   Gsposp(const char*, Int_t, const char*, Float_t, Float_t,
-                        Float_t, Int_t, const char*, Float_t*, Int_t)=0;
-  virtual  void   Gfmate(Int_t, char*, Float_t&, Float_t&, Float_t&, 
-                         Float_t&, Float_t&, Float_t*, Int_t&)=0; 
-  virtual  void   Gsatt(const char*, const char*, Int_t)=0;
-  virtual  void   Gmtod(Float_t*, Float_t*, Int_t)=0;
-  virtual  void   Gdtom(Float_t*, Float_t*, Int_t)=0;
-  virtual  void   Gdraw(const char*,Float_t theta=30, Float_t phi=30,
-                       Float_t psi=0,Float_t u0=10,Float_t v0=10,
-                       Float_t ul=0.01,Float_t vl=0.01)=0;
-  virtual  void   WriteEuclid(const char*, const char*, Int_t, Int_t)=0;
-  virtual void    Rndm(Float_t*, const Int_t) const=0;
-  virtual void    Material(Int_t&, const char*, Float_t, Float_t, Float_t, Float_t,
-                           Float_t, Float_t* buf=0, Int_t nwbuf=0) =0;
-  virtual void    Mixture(Int_t&, const char*, Float_t*, Float_t*, Float_t, Int_t, Float_t*) =0;
-  virtual void    Medium(Int_t&, const char*, Int_t, Int_t, Int_t, Float_t, Float_t, 
-                  Float_t, Float_t, Float_t, Float_t, Float_t *ubuf=0, Int_t nbuf=0) =0;
-  virtual void    Matrix(Int_t&, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t) =0;
-
-  //________________________________________________________________________
-  //
-  //                     Geant3 specific prototypes
-  //
-  //------------------------------------------------------------------------
-
-  virtual void Gdopt(const char*,const char*)=0;
-  virtual  void  SetClipBox(const char*,Float_t=-9999,Float_t=0, Float_t=-9999,Float_t=0,Float_t=-9999,Float_t=0)=0;
-  virtual  void  DefaultRange()=0;
-  virtual  void  Gdhead(Int_t, const char*, Float_t=0)=0;   
-  virtual  void  Gdman(Float_t, Float_t, const char*)=0;
-  virtual  void  Gsord(const char *name, Int_t iax)=0;
-  virtual  void  SetColors()=0;
-  virtual  void  Gtreve()=0;
-  virtual  void  Gtreve_root()=0;
-  virtual  void  Gckmat(Int_t, char*)=0;
-  virtual  void  InitLego()=0;
-  virtual  void  Gfpart(Int_t, char*, Int_t&, Float_t&, Float_t&, Float_t&)=0; 
-  virtual  void  Gspart(Int_t, const char*, Int_t, Float_t, Float_t, Float_t)=0; 
-
-  ClassDef(AliMC,1) //Generic MonteCarlo Class
+    //
+    // methods for building/management of geometry
+    // ------------------------------------------------
+    //
 
+    // functions from GBASE 
+    virtual void  FinishGeometry() = 0; 
+
+    // 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; 
+
+    // detector composition
+    virtual void  Material(Int_t& kmat, const char* name, Float_t a, 
+                     Float_t z, Float_t dens, Float_t radl, Float_t absl,
+                     Float_t* buf, Int_t nwbuf) = 0;
+    virtual void  Mixture(Int_t& kmat, const char *name, Float_t *a, 
+                     Float_t *z, Float_t dens, Int_t nlmat, Float_t *wmat) = 0;
+    virtual void  Medium(Int_t& kmed, const char *name, Int_t nmat, 
+                     Int_t isvol, Int_t ifield, Float_t fieldm, Float_t tmaxfd, 
+                     Float_t stemax, Float_t deemax, Float_t epsil, 
+                    Float_t stmin, Float_t* ubuf, Int_t nbuf) = 0;
+    virtual void  Matrix(Int_t& krot, Float_t thetaX, Float_t phiX, 
+                     Float_t thetaY, Float_t phiY, Float_t thetaZ, 
+                    Float_t phiZ) = 0;
+    virtual void  Gstpar(Int_t itmed, const char *param, Float_t parval) = 0; 
+
+    // functions from GGEOM 
+    virtual Int_t Gsvolu(const char *name, const char *shape, Int_t nmed,  
+                         Float_t *upar, Int_t np) = 0; 
+    virtual void  Gsdvn(const char *name, const char *mother, Int_t ndiv, 
+                        Int_t iaxis) = 0; 
+    virtual void  Gsdvn2(const char *name, const char *mother, Int_t ndiv, 
+                         Int_t iaxis, Float_t c0i, Int_t numed) = 0; 
+    virtual void  Gsdvt(const char *name, const char *mother, Float_t step, 
+                        Int_t iaxis, Int_t numed, Int_t ndvmx) = 0; 
+    virtual void  Gsdvt2(const char *name, const char *mother, Float_t step, 
+                         Int_t iaxis, Float_t c0, Int_t numed, Int_t ndvmx) = 0; 
+    virtual void  Gsord(const char *name, Int_t iax) = 0; 
+    virtual void  Gspos(const char *name, Int_t nr, const char *mother,  
+                        Float_t x, Float_t y, Float_t z, Int_t irot, 
+                        const char *konly="ONLY") = 0; 
+    virtual void  Gsposp(const char *name, Int_t nr, const char *mother,  
+                         Float_t x, Float_t y, Float_t z, Int_t irot,
+                         const char *konly, Float_t *upar, Int_t np) = 0; 
+    
+    // functions for drawing
+    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*,Float_t theta = 30, Float_t phi = 30,
+                       Float_t psi = 0, Float_t u0 = 10, Float_t v0 = 10,
+                       Float_t ul = 0.01, Float_t vl = 0.01) = 0;
+
+    // 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;
+    virtual Int_t NofVolumes() const = 0;
+
+    //
+    // methods for physics management
+    // ------------------------------------------------
+    //
+ 
+    // set methods
+    virtual void SetCut(const char* cutName, Float_t cutValue) = 0;
+    virtual void SetProcess(const char* flagName, Int_t flagValue) = 0;
+    virtual Float_t Xsec(char*, Float_t, Int_t, Int_t) = 0; 
+ 
+        // particle table usage         
+    virtual Int_t   IdFromPDG(Int_t id) const =0;  
+    virtual Int_t   PDGFromId(Int_t pdg) const =0;  
+    virtual void    DefineParticles() = 0;      
+  
+    //
+    // methods for step management
+    // ------------------------------------------------
+    //
+
+    // action methods
+    virtual void StopTrack() =0;
+    virtual void StopEvent() =0;   
+
+    // set methods
+    virtual void SetMaxStep(Float_t) = 0;
+    virtual void SetMaxNStep(Int_t) = 0;
+    virtual void SetUserDecay(Int_t) =0;  
+
+    // get methods
+         // tracking volume(s) 
+    virtual Int_t CurrentVolID(Int_t& copyNo) const =0;
+    virtual Int_t CurrentVolOffID(Int_t off, Int_t& copyNo) const =0;
+    virtual const char* CurrentVolName() const =0;
+    virtual const char* CurrentVolOffName(Int_t off) const =0;
+    virtual Int_t CurrentMaterial(Float_t &a, Float_t &z, 
+                    Float_t &dens, Float_t &radl, Float_t &absl) const =0;  
+    virtual Int_t CurrentEvent() const =0; 
+    virtual void  Gmtod(Float_t* xm, Float_t* xd, Int_t iflag) = 0;
+    virtual void  Gdtom(Float_t* xd, Float_t* xm, Int_t iflag)= 0 ;
+    virtual Float_t MaxStep() const =0;
+    virtual Int_t GetMaxNStep() const = 0;
+    virtual Int_t GetMedium() const =0;
+
+        // tracking particle 
+        // dynamic properties
+    virtual void    TrackPosition(TLorentzVector& position) const =0;
+    virtual void    TrackMomentum(TLorentzVector& momentum) const =0;
+    virtual Float_t TrackStep() const =0;
+    virtual Float_t TrackLength() const =0; 
+    virtual Float_t TrackTime() const =0;
+    virtual Float_t Edep() const =0;
+        // static properties
+    virtual Int_t   TrackPid() const =0;
+    virtual Float_t TrackCharge() const =0;
+    virtual Float_t TrackMass() const =0;
+    virtual Float_t Etot() const =0;
+
+        // track status
+    virtual Bool_t  IsTrackInside() const =0;
+    virtual Bool_t  IsTrackEntering() const =0;
+    virtual Bool_t  IsTrackExiting() const =0;
+    virtual Bool_t  IsTrackOut() const =0;
+    virtual Bool_t  IsTrackDisappeared() const =0;
+    virtual Bool_t  IsTrackStop() const =0;
+    virtual Bool_t  IsTrackAlive() const=0;
+
+        // secondaries
+    virtual Int_t NSecondaries() const=0;
+    virtual void  GetSecondary(Int_t isec, Int_t& particleId, 
+                    TLorentzVector& position, TLorentzVector& momentum) =0;
+    virtual const char* ProdProcess() const =0; 
+
+    //
+    // other (then geometry/step/run management) methods
+    // ----------------------------------------------
+    //
+    virtual void Rndm(Float_t* array, const Int_t size) const=0; 
+    
+    //
+    // Geant3 specific methods
+    // !!! need to be transformed to common interface
+    //
+    virtual void Gdopt(const char*,const char*) = 0;
+    virtual void SetClipBox(const char*,Float_t=-9999,Float_t=0, Float_t=-9999,Float_t=0,Float_t=-9999,Float_t=0) = 0;
+    virtual void DefaultRange() = 0;
+    virtual void Gdhead(Int_t, const char*, Float_t=0) = 0;   
+    virtual void Gdman(Float_t, Float_t, const char*) = 0;
+    virtual void SetColors() = 0;
+    virtual void Gtreve() = 0;
+    virtual void Gtreve_root() = 0;
+    virtual void Gckmat(Int_t, char*) = 0;
+    virtual void InitLego() = 0;
+    virtual void Gfpart(Int_t, char*, Int_t&, Float_t&, Float_t&, Float_t&) = 0; 
+    virtual void Gspart(Int_t, const char*, Int_t, Float_t, Float_t, Float_t) = 0; 
+
+  private:
+    static AliMC*  fgMC;
+
+  ClassDef(AliMC,1)  //Geometry Interface Class
 };
 
+// inline methods
+inline AliMC* AliMC::GetMC() { return fgMC; }
+
 R__EXTERN AliMC *gMC;
 
-#endif
+#endif // ALI_MC_H
 

diff --git a/TGeant3/TGeant3.cxx b/TGeant3/TGeant3.cxx
index 4c0675f5cb0f3333481b3682063eb625eb74c545..55111740012eb574bd0b79011a5639ba00e77084 100644 (file)
--- a/TGeant3/TGeant3.cxx
+++ b/TGeant3/TGeant3.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.23  2000/02/23 16:25:25  fca
+AliVMC and AliGeant3 classes introduced
+ReadEuclid moved from AliRun to AliModule
+
 Revision 1.22  2000/01/18 15:40:13  morsch
 Interface to GEANT3 routines GFTMAT, GBRELM and GPRELM added
 Define geant particle type 51: Feedback Photon with Cherenkov photon properties.
@@ -1004,7 +1008,7 @@ void TGeant3::DefineParticles()
 }
 
 //_____________________________________________________________________________
-Int_t TGeant3::VolId(Text_t *name) const
+Int_t TGeant3::VolId(const Text_t *name) const
 {
   //
   // Return the unique numeric identifier for volume name
@@ -1039,6 +1043,66 @@ const char* TGeant3::VolName(Int_t id) const
     return fVolNames[id-1];
 }
 
+//_____________________________________________________________________________
+void    TGeant3::SetCut(const char* cutName, Float_t cutValue)
+{
+  if(!strcmp(cutName,"CUTGAM")) 
+    fGccuts->cutgam=cutValue; 
+  else if(!strcmp(cutName,"CUTGAM")) 
+    fGccuts->cutele=cutValue; 
+  else if(!strcmp(cutName,"CUTELE")) 
+    fGccuts->cutneu=cutValue; 
+  else if(!strcmp(cutName,"CUTHAD")) 
+    fGccuts->cuthad=cutValue; 
+  else if(!strcmp(cutName,"CUTMUO")) 
+    fGccuts->cutmuo=cutValue; 
+  else if(!strcmp(cutName,"BCUTE")) 
+    fGccuts->bcute=cutValue; 
+  else if(!strcmp(cutName,"BCUTM")) 
+    fGccuts->bcutm=cutValue; 
+  else if(!strcmp(cutName,"DCUTE")) 
+    fGccuts->dcute=cutValue; 
+  else if(!strcmp(cutName,"DCUTM")) 
+    fGccuts->dcutm=cutValue; 
+  else if(!strcmp(cutName,"PPCUTM")) 
+    fGccuts->ppcutm=cutValue; 
+  else if(!strcmp(cutName,"TOFMAX")) 
+    fGccuts->tofmax=cutValue; 
+  else Warning("SetCut","Cut %s not implemented\n",cutName);
+}
+
+//_____________________________________________________________________________
+void    TGeant3::SetProcess(const char* flagName, Int_t flagValue)
+{
+  if(!strcmp(flagName,"PAIR")) 
+    fGcphys->ipair=flagValue;
+  else if(!strcmp(flagName,"COMP")) 
+    fGcphys->icomp=flagValue;
+  else if(!strcmp(flagName,"PHOT")) 
+    fGcphys->iphot=flagValue;
+  else if(!strcmp(flagName,"PFIS")) 
+    fGcphys->ipfis=flagValue;
+  else if(!strcmp(flagName,"DRAY")) 
+    fGcphys->idray=flagValue;
+  else if(!strcmp(flagName,"ANNI")) 
+    fGcphys->ianni=flagValue;
+  else if(!strcmp(flagName,"BREM")) 
+    fGcphys->ibrem=flagValue;
+  else if(!strcmp(flagName,"HADR")) 
+    fGcphys->ihadr=flagValue;
+  else if(!strcmp(flagName,"MUNU")) 
+    fGcphys->imunu=flagValue;
+  else if(!strcmp(flagName,"DCAY")) 
+    fGcphys->idcay=flagValue;
+  else if(!strcmp(flagName,"LOSS")) 
+    fGcphys->iloss=flagValue;
+  else if(!strcmp(flagName,"MULS")) 
+    fGcphys->imuls=flagValue;
+  else if(!strcmp(flagName,"RAYL")) 
+    fGcphys->irayl=flagValue;
+  else  Warning("SetFlag","Flag %s not implemented\n",flagName);
+}
+
 //_____________________________________________________________________________
 Float_t TGeant3::Xsec(char* reac, Float_t energy, Int_t part, Int_t mate)
 {

diff --git a/TGeant3/TGeant3.h b/TGeant3/TGeant3.h
index ee3e362833b7a324fe7804eea5d4a2343e7d67f7..f8889afd6042f63e048658d16aaeea41603e9587 100644 (file)
--- a/TGeant3/TGeant3.h
+++ b/TGeant3/TGeant3.h
@@ -584,7 +584,7 @@ public:
   Int_t CurrentVolOffID(Int_t off, Int_t &copy) const;
   const char* CurrentVolName() const;
   const char *CurrentVolOffName(Int_t off) const;
-  Int_t VolId(Text_t *name) const;
+  Int_t VolId(const Text_t *name) const;
   Int_t IdFromPDG(Int_t pdg) const;
   Int_t PDGFromId(Int_t pdg) const;
   void  DefineParticles();
@@ -617,6 +617,8 @@ public:
   void  SetMaxStep(Float_t maxstep);
   void  SetMaxNStep(Int_t maxnstp);
   Int_t GetMaxNStep() const;
+  void SetCut(const char* cutName, Float_t cutValue);
+  void SetProcess(const char* flagName, Int_t flagValue);
   //  void GetParticle(const Int_t pdg, char *name, Float_t &mass) const;
   virtual Int_t GetMedium() const;
   virtual Float_t Edep() const;

diff --git a/TGeant3/TGeant3Dummy.cxx b/TGeant3/TGeant3Dummy.cxx
index 51ee12d2b1eb455df1b07e69a39a18a07bfb8416..26d64575ad80325ea574e5dbd88c245af78ea89a 100644 (file)
--- a/TGeant3/TGeant3Dummy.cxx
+++ b/TGeant3/TGeant3Dummy.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.17  2000/02/23 16:25:25  fca
+AliVMC and AliGeant3 classes introduced
+ReadEuclid moved from AliRun to AliModule
+
 Revision 1.16  2000/01/18 16:27:18  morsch
 Dummy definition of Gftmat, Gbrelm and Gprelm added.
 
@@ -77,7 +81,9 @@ void    TGeant3::TrackMomentum(TLorentzVector&) const {}
 Int_t   TGeant3::IdFromPDG(Int_t) const {return -1;}
 Int_t   TGeant3::PDGFromId(Int_t) const {return -1;}
 void    TGeant3::DefineParticles() {}
-Int_t   TGeant3::VolId(Text_t*) const {return 0;}
+Int_t   TGeant3::VolId(const Text_t*) const {return 0;}
+void    TGeant3::SetCut(const char* , Float_t ) {}
+void    TGeant3::SetProcess(const char* , Int_t ) {}
 const char*   TGeant3::VolName(Int_t ) const {return 0;}
 Float_t TGeant3::TrackCharge() const {return 0;}
 Float_t TGeant3::TrackMass() const {return 0;}