X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSAlignMilleModule.h;h=b5594f60ce2566666620ed7b863bee13d681ef37;hb=92fabd039e41091628d7854f3b4fb02e5b795f5a;hp=e20a2461165c3d790d6735777d29bb12038536e0;hpb=75d480f665fb08b6c9e5dcf60f5b536f9573f903;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSAlignMilleModule.h b/ITS/AliITSAlignMilleModule.h
index e20a2461165..b5594f60ce2 100644
--- a/ITS/AliITSAlignMilleModule.h
+++ b/ITS/AliITSAlignMilleModule.h
@@ -14,7 +14,6 @@
 //#include <TObject.h> 
 #include <TNamed.h> 
 
-#define ITSMILLENSENSVOL    2198
 
 class AliAlignObjParams; 
 class TGeoHMatrix; 
@@ -24,7 +23,7 @@ class AliITSAlignMilleModule : public TNamed
 public: 
   AliITSAlignMilleModule(); 
   AliITSAlignMilleModule(UShort_t volid); // basic single volume constructor
-  AliITSAlignMilleModule(Int_t index, UShort_t volid, char* symname, TGeoHMatrix *m, Int_t nsv=0, UShort_t *volidsv=NULL); // general constructor
+  AliITSAlignMilleModule(Int_t index, UShort_t volid, char* symname, const TGeoHMatrix *m, Int_t nsv=0, const UShort_t *volidsv=NULL); // general constructor
 
   AliITSAlignMilleModule(const AliITSAlignMilleModule& rhs); // copy constructor
   AliITSAlignMilleModule& operator=(const AliITSAlignMilleModule& rhs);  
@@ -38,7 +37,7 @@ public:
   TGeoHMatrix *GetMatrix() const {return fMatrix;} 
   const UShort_t *GetSensitiveVolumeVolumeID() const {return fSensVolVolumeID;}
 
-  Int_t     Set(Int_t index, UShort_t volid, char* symname, const TGeoHMatrix * const m, Int_t nsv=0, UShort_t *volidsv=NULL); // initialize a super module
+  Int_t     Set(Int_t index, UShort_t volid, char* symname, const TGeoHMatrix * const m, Int_t nsv=0, const UShort_t *volidsv=NULL); // initialize a super module
   
   // util
   static Int_t GetIndexFromVolumeID(UShort_t volid);
@@ -50,7 +49,7 @@ public:
   TGeoHMatrix *GetSensitiveVolumeMatrix(UShort_t voluid);
   TGeoHMatrix *GetSensitiveVolumeOrigGlobalMatrix(UShort_t voluid);
   TGeoHMatrix *GetSensitiveVolumeModifiedMatrix(UShort_t voluid, const Double_t * const deltalocal); 
-  AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, AliAlignObjParams *a); 
+  AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, const AliAlignObjParams *a); 
   AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, const Double_t * const deltalocal); 
   // forse non serve...
   AliAlignObjParams *GetSensitiveVolumeGlobalMisalignment(UShort_t voluid, const Double_t * const deltalocal); 
@@ -64,12 +63,13 @@ protected:
   void      AddSensitiveVolume(UShort_t volid);
 
 private:
+  static const Int_t fgkSensModules = 2198; // number of sensors
   Int_t          fNSensVol; ///
   Int_t          fIndex; ///
   UShort_t       fVolumeID; ///
   // il symname e' il nome del TNamed...
-  Int_t          fSensVolIndex[ITSMILLENSENSVOL]; ///
-  UShort_t       fSensVolVolumeID[ITSMILLENSENSVOL]; ///
+  Int_t          fSensVolIndex[fgkSensModules]; ///
+  UShort_t       fSensVolVolumeID[fgkSensModules]; ///
   TGeoHMatrix   *fMatrix; /// ideal TGeoHMatrix of the supermodule
   TGeoHMatrix   *fSensVolMatrix; ///
   TGeoHMatrix   *fSensVolModifMatrix; ///