X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FAliHMPIDv2.h;h=7bc61c49b7c0dc3e565a00a72acc92dcc87e1d8c;hb=f4719a27e63a747e95744462751dde999759b032;hp=63f2232c4e14ed578c1c3acfedbba93ea8c8c3ca;hpb=a137507fb9ce7d343f9b11d3bb66ed65a7e54cd0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HMPID/AliHMPIDv2.h b/HMPID/AliHMPIDv2.h
index 63f2232c4e1..7bc61c49b7c 100644
--- a/HMPID/AliHMPIDv2.h
+++ b/HMPID/AliHMPIDv2.h
@@ -11,20 +11,22 @@
 
 #include "AliHMPID.h"             //base class 
 #include "AliHMPIDDigitizer.h"    //CreateDigitizer()
-
-class AliHMPIDv2 : public AliHMPID //TObject-TNamed-AliModule-AliDetector-AliHMPID-AliHMPIDv0
+#include <TGeoManager.h>     
+class AliHMPIDv2 : public AliHMPID //TObject-TNamed-AliModule-AliDetector-AliHMPID-AliHMPIDv2
 {
 public:
                  AliHMPIDv2()                                   :AliHMPID(          ),fIdPad(-1),fIdCell(-1) {;}          //default ctor
                  AliHMPIDv2(const char *name, const char *title):AliHMPID(name,title),fIdPad(-1),fIdCell(-1) {;}          //named ctor
   virtual       ~AliHMPIDv2()                                                         {;}          //dtor
 //framework part++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++   
-          void    AddAlignableVolumes(                               )const;                                   //from AliModule invoked from AliMC    
+          void    AddAlignableVolumes(                               )const;                                   //from AliModule invoked from AliMC           
           void    CreateMaterials  (                                 );                                        //from AliModule invoked from AliMC
+static    void    IdealPosition(Int_t iCh,TGeoHMatrix *m);                                                     //ideal position of a given chamber 
           void    CreateGeometry   (                                 );                                        //from AliModule invoked from AliMC
   AliDigitizer*   CreateDigitizer  (AliRunDigitizer *m               )const{return new AliHMPIDDigitizer(m);}  //from AliModule invoked from AliSimulation::RunDigitization()
           void    Digits2Raw       (                                 );                                        //from AliModule invoked from AliSimulation::WriteRawFiles()
   virtual void    DefineOpticalProperties(                           );                                        //from AliModule invoked from AliMC::ConstructOpGeometry() to set Cerenkov properties
+          //void    InitProperties   (                                 );                                        //define the phys processes on/off (dray,eloss...)                                                 
           void    Hits2SDigits     (                                 );                                        //from AliModule invoked from AliSimulation::RunSDigitization()
           void    Init             (                                 );                                        //from AliModule invoked from AliMC::InitGeometry()
           Int_t   IsVersion        (                                 )const{return 1;                      }   //from AliModule not used
@@ -41,7 +43,7 @@ public:
   static  void    TestGeom         (                                 );                                        //tests the validity of geometry
   static  void    TestPoint        (Int_t ch,Float_t x,Float_t y     );                                        //tests the validity of geometry
 protected:
-  enum EMedia {kAir=1,kRoha=2,kSiO2=3,kC6F14=4,kCH4=5,kCsI=6,kAl=7,kCu=8,kW=9,kNeo=10,kAr=11};                               //media ids, used for geometry creation  
+  enum EMedia {kAir=1,kRoha=2,kSiO2=3,kC6F14=4,kCH4=5,kCsI=6,kAl=7,kCu=8,kW=9,kNeo=10,kAr=11};                       //media ids, used for geometry creation  
   enum Ecounters {kMipEnterRad=1,kCkovNew,kCkovNewRad,kCkovNewWin,kCkovNewProxGap,kCkovNewAmpGap,kCkovEnterPc,kPhotoEle};    //counters id's
   Int_t fIdPad,fIdCell;                                                                 //! volumes ID's used in StepManager() and Count()
   ClassDef(AliHMPIDv2,2)                                                                //HMPID full version for simulation