Changes in configuration

[u/mrichter/AliRoot.git] / EVE / EveDet / AliEveITSDigitsInfo.h

diff --git a/EVE/EveDet/AliEveITSDigitsInfo.h b/EVE/EveDet/AliEveITSDigitsInfo.h
index b4eee9fce1bec1d21b1018b8287284928d5af900..e68a8fbb7a18fefd38bfa9c8108ad8a98af05ba2 100644 (file)
--- a/EVE/EveDet/AliEveITSDigitsInfo.h
+++ b/EVE/EveDet/AliEveITSDigitsInfo.h
@@ -7,23 +7,23 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-#ifndef ALIEVE_ITSDigitsInfo_H
-#define ALIEVE_ITSDigitsInfo_H
+#ifndef AliEveITSDigitsInfo_H
+#define AliEveITSDigitsInfo_H
 
 #include <TEveUtil.h>
+#include <TObject.h>
 
 #include <map>
 #include <vector>
 
-#include <TObject.h>
-#include <TClonesArray.h>
-#include <TTree.h>
+class TClonesArray;
+class TTree;
 
-#include <AliITS.h>
-#include <AliITSgeom.h>
-#include <AliITSsegmentationSPD.h>
-#include <AliITSsegmentationSDD.h>
-#include <AliITSsegmentationSSD.h>
+//class AliITSgeom;
+class AliITSsegmentationSPD;
+class AliITSsegmentationSDD;
+class AliITSsegmentationSSD;
+class AliITSDDLModuleMapSDD;
 
 class AliRawReader;
 
@@ -69,10 +69,10 @@ public:
 
 class AliEveITSDigitsInfo : public TObject, public TEveRefCnt
 {
+private:
   AliEveITSDigitsInfo(const AliEveITSDigitsInfo&);            // Not implemented
   AliEveITSDigitsInfo& operator=(const AliEveITSDigitsInfo&); // Not implemented
 
-private:
   Float_t fSPDZCoord[192];                // Precalculated z-coordinates for positions of digits.
 
   void InitInternals();
@@ -87,17 +87,17 @@ protected:
 public:
   TTree*                   fTree;         // Tree from which the digits are read.
 
-  AliITSgeom*              fGeom;         // Provides mapping from module-id to transforamtion-matrix.
   AliITSsegmentationSPD*   fSegSPD;       // Segmentation of SPD.
   AliITSsegmentationSDD*   fSegSDD;       // Segmentation of SDD.
   AliITSsegmentationSSD*   fSegSSD;       // Segmentation of SSD.
+  AliITSDDLModuleMapSDD*   fDDLMapSDD;    // Mapping DDL/module to SDD-module number.
 
-  Int_t                    fSPDMinVal;    // Default lower limit for display of SPD digits.
-  Int_t                    fSSDMinVal;    // Default lower limit for display of SSD digits.
-  Int_t                    fSDDMinVal;    // Default lower limit for display of SDD digits.
-  Int_t                    fSPDMaxVal;    // Default high  limit for display of SPD digits.
-  Int_t                    fSSDMaxVal;    // Default high  limit for display of SSD digits.
-  Int_t                    fSDDMaxVal;    // Default high  limit for display of SDD digits.
+  Int_t                    fSPDMinVal;    // Default low  limit for display of SPD digits.
+  Int_t                    fSSDMinVal;    // Default low  limit for display of SSD digits.
+  Int_t                    fSDDMinVal;    // Default low  limit for display of SDD digits.
+  Int_t                    fSPDMaxVal;    // Default high limit for display of SPD digits.
+  Int_t                    fSSDMaxVal;    // Default high limit for display of SSD digits.
+  Int_t                    fSDDMaxVal;    // Default high limit for display of SDD digits.
 
   Int_t                    fSPDHighLim;   // Maximum value of SPD digits.
   Int_t                    fSDDHighLim;   // Maximum value of SDD digits.
@@ -117,16 +117,17 @@ public:
 
   TClonesArray* GetDigits(Int_t moduleID, Int_t detector);
 
-  void GetSPDLocalZ(Int_t j, Float_t& z);
+  void GetSPDLocalZ(Int_t j, Float_t& z) const;
 
   void GetModuleIDs(AliEveITSModuleSelection* sel, std::vector<UInt_t>& ids);
 
   virtual void Print(Option_t* opt="") const;
 
-  ClassDef(AliEveITSDigitsInfo, 1); // Stores ITS geometry information and event-data in format suitable for visualization.
+  ClassDef(AliEveITSDigitsInfo, 0); // Stores ITS geometry information and event-data in format suitable for visualization.
 }; // endclass AliEveITSDigitsInfo
 
-inline void AliEveITSDigitsInfo::GetSPDLocalZ(Int_t j, Float_t& z)
+
+inline void AliEveITSDigitsInfo::GetSPDLocalZ(Int_t j, Float_t& z) const
 {
   z = fSPDZCoord[j];
 }