Corrected index (aplhacxx6)

[u/mrichter/AliRoot.git] / MUON / AliMUON.h

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 024e3d6ea82cc6d226ed0f4ad9627a364f85b405..8703ec882e46eeda556458c3fca5be2d7d2c33c7 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -21,19 +21,17 @@ class TFile;
 class TTree;
 
 class AliLoader;
-class AliSegmentation;
+class AliMUONGeometrySegmentation;
 class AliMUONTriggerCircuit;
 class AliMUONData;
 class AliMUONResponse;
-class AliMUONMerger;
 class AliMUONHit;
-class AliMUONPadHit;
 class AliMUONRawCluster;
 class AliMUONReconstHit;
-class AliMUONMerger;
 class AliMUONGeometryBuilder;
 class AliMUONVGeometryBuilder;
 class AliMUONGeometryDEIndexing;
+class AliMUONFactoryV2;
 class AliESD;
 
 class AliMUON : public  AliDetector 
@@ -74,7 +72,6 @@ class AliMUON : public  AliDetector
     // Set Z values for all chambers
     virtual void SetChambersZ(const Float_t *Z);
     virtual void SetChambersZToDefault(void);
-    virtual void SetPadSize(Int_t id, Int_t isec, Float_t p1, Float_t p2);
     // Set Signal Generation Parameters
     virtual void   SetSigmaIntegration(Int_t id, Float_t p1);
     virtual void   SetChargeSlope(Int_t id, Float_t p1);
@@ -82,20 +79,19 @@ class AliMUON : public  AliDetector
     virtual void   SetMaxAdc(Int_t id, Int_t p1);
     // Set Segmentation and Response Model
     virtual void   SetSegmentationModel(Int_t id, Int_t isec,
-                                       AliSegmentation *segmentation);
+                                       AliMUONGeometrySegmentation* segmentation);
+
+    void SetSegmentationType(Int_t type) {fSegmentationType = type;}// 1 for old 2 for new, 0 undefined
+    Int_t WhichSegmentation() {return fSegmentationType; }
+
     virtual void   SetResponseModel(Int_t id, AliMUONResponse *response);
     virtual void   SetNsec(Int_t id, Int_t nsec);
 
-    // Set Merger/Digitizer
-    virtual void   SetMerger(AliMUONMerger* merger);
-    virtual AliMUONMerger* Merger();
-    
     // Set Stepping Parameters
     virtual void   SetMaxStepGas(Float_t p1);
     virtual void   SetMaxStepAlu(Float_t p1);
     virtual void   SetMaxDestepGas(Float_t p1);
     virtual void   SetMaxDestepAlu(Float_t p1);
-    virtual void   SetAcceptance(Bool_t acc=0, Float_t angmin=2, Float_t angmax=9);
    
     // Get Stepping Parameters
     virtual Float_t  GetMaxStepGas() const;
@@ -112,9 +108,6 @@ class AliMUON : public  AliDetector
     // Return reference to Circuit #id
     virtual AliMUONTriggerCircuit& TriggerCircuit(Int_t id)
       {return *((AliMUONTriggerCircuit *) (*fTriggerCircuits)[id]);}
-    // Retrieve pad hits for a given Hit
-    virtual AliMUONPadHit* FirstPad(AliMUONHit *hit, TClonesArray *padHits);
-    virtual AliMUONPadHit* NextPad(TClonesArray *padHits);
     // Return pointers to digits
     AliMUONRawCluster    *RawCluster(Int_t ichamber, Int_t icathod,
                                     Int_t icluster);
@@ -133,6 +126,7 @@ class AliMUON : public  AliDetector
     TObjArray*            fChambers;           // List of Tracking Chambers
     TObjArray*            fTriggerCircuits;    // List of Trigger Circuits
     AliMUONGeometryBuilder*     fGeometryBuilder; // Geometry builder 
+    Int_t                 fSegmentationType;    // type for  segmentation
     AliMUONGeometryDEIndexing*  fDEIndexing;   // Geometry DE indexing 
    
     //
@@ -150,9 +144,9 @@ class AliMUON : public  AliDetector
     Int_t fMaxIterPad;        // Maximum pad index
     Int_t fCurIterPad;        // Current pad index
     // Background eent for event mixing
-    AliMUONMerger *fMerger;   // ! pointer to merger
+    AliMUONFactoryV2* fFactory; // ! MUON factory
     
-    ClassDef(AliMUON,7)  // MUON Detector base class
+    ClassDef(AliMUON,8)  // MUON Detector base class
 };
 #endif