]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUON.cxx
Removing inheritances from TAttLine, TAttMarker and AliRndm in AliModule. The copy...
[u/mrichter/AliRoot.git] / MUON / AliMUON.cxx
index 1ca5dd1101a16d8ee93aba1d5fda8629dc976809..e40232118eef7060134b0dc8de466957fabfdcf4 100644 (file)
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-/*
-$Log$
-Revision 1.45  2001/01/26 20:00:49  hristov
-Major upgrade of AliRoot code
 
-Revision 1.44  2001/01/25 17:39:09  morsch
-Pass size of fNdch and fNrawch to CINT.
+/* $Id$ */
 
-Revision 1.43  2001/01/23 18:58:19  hristov
-Initialisation of some pointers
+// ------------------
+// Class AliMUON
+// ------------------
+// AliDetector class for MUON subsystem 
+// providing simulation data management 
 
-Revision 1.42  2001/01/17 20:53:40  hristov
-Destructors corrected to avoid memory leaks
+#include "Riostream.h"
 
-Revision 1.41  2000/12/21 22:12:40  morsch
-Clean-up of coding rule violations,
-
-Revision 1.40  2000/11/29 20:32:26  gosset
-Digitize:
-1. correction for array index out of bounds
-2. one printout commented
-
-Revision 1.39  2000/11/12 17:17:03  pcrochet
-BuildGeometry of AliMUON for trigger chambers delegated to AliMUONSegmentationTriggerX (same strategy as for tracking chambers)
-
-Revision 1.38  2000/11/06 09:20:43  morsch
-AliMUON delegates part of BuildGeometry() to AliMUONSegmentation using the
-Draw() method. This avoids code and parameter replication.
-
-Revision 1.37  2000/10/26 09:53:37  pcrochet
-put back trigger chambers in the display (there was a problem in buildgeometry)
-
-Revision 1.36  2000/10/25 19:51:18  morsch
-Correct x-position of chambers.
-
-Revision 1.35  2000/10/24 19:46:21  morsch
-BuildGeometry updated for slats in station 3-4.
-
-Revision 1.34  2000/10/18 11:42:06  morsch
-- AliMUONRawCluster contains z-position.
-- Some clean-up of useless print statements during initialisations.
-
-Revision 1.33  2000/10/09 14:01:57  morsch
-Unused variables removed.
-
-Revision 1.32  2000/10/06 09:08:10  morsch
-Built geometry includes slat geometry for event display.
-
-Revision 1.31  2000/10/02 21:28:08  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.30  2000/10/02 16:58:29  egangler
-Cleaning of the code :
--> coding conventions
--> void Streamers
--> some useless includes removed or replaced by "class" statement
-
-Revision 1.29  2000/07/28 13:49:38  morsch
-SetAcceptance defines inner and outer chamber radii according to angular acceptance.
-Can be used for simple acceptance studies.
-
-Revision 1.28  2000/07/22 16:43:15  morsch
-Same comment as before, but now done correctly I hope (sorry it's Saturday evening)
-
-Revision 1.27  2000/07/22 16:36:50  morsch
-Change order of indices in creation (new) of xhit and yhit
-
-Revision 1.26  2000/07/03 11:54:57  morsch
-AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHitMap in STEER
-The methods GetPadIxy and GetPadXxy of AliMUONSegmentation have changed name to GetPadI and GetPadC.
-
-Revision 1.25  2000/06/29 12:34:09  morsch
-AliMUONSegmentation class has been made independent of AliMUONChamber. This makes
-it usable with any other geometry class. The link to the object to which it belongs is
-established via an index. This assumes that there exists a global geometry manager
-from which the pointer to the parent object can be obtained (in our case gAlice).
-
-Revision 1.24  2000/06/28 15:16:35  morsch
-(1) Client code adapted to new method signatures in AliMUONSegmentation (see comments there)
-to allow development of slat-muon chamber simulation and reconstruction code in the MUON
-framework. The changes should have no side effects (mostly dummy arguments).
-(2) Hit disintegration uses 3-dim hit coordinates to allow simulation
-of chambers with overlapping modules (MakePadHits, Disintegration).
-
-Revision 1.23  2000/06/28 12:19:17  morsch
-More consequent seperation of global input data services (AliMUONClusterInput singleton) and the
-cluster and hit reconstruction algorithms in AliMUONClusterFinderVS.
-AliMUONClusterFinderVS becomes the base class for clustering and hit reconstruction.
-It requires two cathode planes. Small modifications in the code will make it usable for
-one cathode plane and, hence, more general (for test beam data).
-AliMUONClusterFinder is now obsolete.
-
-Revision 1.22  2000/06/28 08:06:10  morsch
-Avoid global variables in AliMUONClusterFinderVS by seperating the input data for the fit from the
-algorithmic part of the class. Input data resides inside the AliMUONClusterInput singleton.
-It also naturally takes care of the TMinuit instance.
-
-Revision 1.21  2000/06/27 08:54:41  morsch
-Problems with on constant array sizes (in hitMap, nmuon, xhit, yhit) corrected.
-
-Revision 1.20  2000/06/26 14:02:38  morsch
-Add class AliMUONConstants with MUON specific constants using static memeber data and access methods.
-
-Revision 1.19  2000/06/22 13:40:51  morsch
-scope problem on HP, "i" declared once
-pow changed to TMath::Power (PH, AM)
-
-Revision 1.18  2000/06/15 07:58:48  morsch
-Code from MUON-dev joined
-
-Revision 1.14.4.17  2000/06/14 14:36:46  morsch
-- add TriggerCircuit (PC)
-- add GlobalTrigger and LocalTrigger and specific methods (PC)
-
-Revision 1.14.4.16  2000/06/09 21:20:28  morsch
-Most coding rule violations corrected
-
-Revision 1.14.4.15  2000/05/02 09:54:32  morsch
-RULE RN17 violations corrected
-
-Revision 1.14.4.12  2000/04/26 12:25:02  morsch
-Code revised by P. Crochet:
-- Z position of TriggerChamber changed according to A.Tournaire Priv.Comm.
-- ToF included in the method MakePadHits
-- inner radius of flange between beam shielding and trigger corrected
-- Trigger global volume updated (according to the new geometry)
-
-Revision 1.14.4.11  2000/04/19 19:42:08  morsch
-Some changes of variable names curing viols and methods concerning
-correlated clusters removed.
-
-Revision 1.14.4.10  2000/03/22 16:44:07  gosset
-Memory leak suppressed in function Digitise:
-p_adr->Delete() instead of Clear (I.Chevrot and A.Baldisseri)
-
-Revision 1.14.4.9  2000/03/20 18:15:25  morsch
-Positions of trigger chambers corrected (P.C.)
-
-Revision 1.14.4.8  2000/02/21 15:38:01  morsch
-Call to AddHitList introduced to make this version compatible with head.
-
-Revision 1.14.4.7  2000/02/20 07:45:53  morsch
-Bugs in Trigger part of BuildGeomemetry corrected (P.C)
-
-Revision 1.14.4.6  2000/02/17 14:28:54  morsch
-Trigger included into initialization and digitization
-
-Revision 1.14.4.5  2000/02/15 10:02:58  morsch
-Log messages of previous revisions added
-
-Revision 1.14.4.2  2000/02/04 10:57:34  gosset
-Z position of the chambers:
-it was the Z position of the stations;
-it is now really the Z position of the chambers.
-   !!!! WARNING: THE CALLS TO "AliMUONChamber::SetZPOS"
-   !!!!                   AND "AliMUONChamber::ZPosition"
-   !!!! HAVE TO BE CHANGED TO "AliMUONChamber::"SetZ"
-   !!!!                   AND "AliMUONChamber::Z"
-
-Revision 1.14.4.3  2000/02/04 16:19:04  gosset
-Correction for mis-spelling of NCH 
-
-Revision 1.14.4.4  2000/02/15 09:43:38  morsch
-Log message added
-
-*/
-
-
-///////////////////////////////////////////////
-//  Manager and hits classes for set:MUON     //
-////////////////////////////////////////////////
-
-#include <TTUBE.h>
+#include <AliPDG.h>
 #include <TBRIK.h>
-#include <TRotMatrix.h>
+#include <TCanvas.h>
+#include <TDirectory.h>
+#include <TFile.h>
 #include <TGeometry.h>
+#include <TMinuit.h>
 #include <TNode.h> 
-#include <TTree.h> 
-#include <TRandom.h> 
-#include <TObject.h>
-#include <TVector.h>
+#include <TNtuple.h>
 #include <TObjArray.h>
-#include <TMinuit.h>
+#include <TObject.h>
+#include <TObjectTable.h>
+#include <TPad.h>
 #include <TParticle.h>
 #include <TROOT.h>
-#include <TFile.h>
-#include <TNtuple.h>
-#include <TCanvas.h>
-#include <TPad.h>
-#include <TDirectory.h>
-#include <TObjectTable.h>
-#include <AliPDG.h>
+#include <TRandom.h> 
+#include <TRotMatrix.h>
+#include <TTUBE.h>
 #include <TTUBE.h>
+#include <TTree.h> 
+#include <TVector.h>
+#include <TVirtualMC.h>
 
+//#include "AliHeader.h"
+#include "AliLoader.h"
+#include "AliRunDigitizer.h"
+#include "AliMC.h"
+#include "AliRun.h"    
 #include "AliMUON.h"
-#include "AliMUONHit.h"
-#include "AliMUONPadHit.h"
-#include "AliMUONDigit.h"
-#include "AliMUONTransientDigit.h"
-#include "AliMUONRawCluster.h"
-#include "AliMUONLocalTrigger.h"
-#include "AliMUONGlobalTrigger.h"
-#include "AliMUONTriggerCircuit.h"
-#include "AliHitMap.h"
-#include "AliMUONHitMapA1.h"
 #include "AliMUONChamberTrigger.h"
 #include "AliMUONConstants.h"
-#include "AliMUONClusterFinderVS.h"
-#include "AliMUONTriggerDecision.h"
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliMUONClusterInput.h"
-#include "iostream.h"
-#include "AliCallf77.h" 
-#include "AliConst.h" 
+#include "AliMUONHit.h"        
+#include "AliMUONRawCluster.h"
+#include "AliMUONGeometry.h"
+#include "AliMUONGeometryTransformer.h"
+#include "AliMUONGeometryBuilder.h"
+#include "AliMUONCommonGeometryBuilder.h"
+#include "AliMUONVGeometryBuilder.h"   
+#include "AliMUONGeometrySegmentation.h"
+#include "AliMUONRawWriter.h"
+#include "AliMUONSegmentation.h"
+#include "AliLog.h"
+
+#include "AliMUONSDigitizerV2.h"
+#include "AliMUONDigitizerV3.h"
+#include "AliMUONDigitMaker.h"
+
+#include "AliMUONSt1GeometryBuilderV2.h"
+#include "AliMUONSt2GeometryBuilderV2.h"
+#include "AliMUONSlatGeometryBuilder.h"
+#include "AliMUONTriggerGeometryBuilder.h"
 
 // Defaults parameters for Z positions of chambers
 // taken from values for "stations" in AliMUON::AliMUON
@@ -242,1402 +89,419 @@ Log message added
 //          according to (Z1 = zch) and  (Z2 = zch + DTPLANES)
 //          for the first and second chambers in the station, respectively
 
-ClassImp(AliMUON)
-//___________________________________________
+/// \cond CLASSIMP
+ClassImp(AliMUON)  
+/// \endcond
+
+//__________________________________________________________________
 AliMUON::AliMUON()
-{
-// Default Constructor
-//
-    fNCh             = 0;
-    fNTrackingCh     = 0;
+  : AliDetector(),
+    fNCh(0),
+    fNTrackingCh(0),
+    fMUONData(0),
+    fSplitLevel(0),
+    fChambers(0),
+    fGeometryBuilder(0),
+    fSegmentation(0),
+    fAccCut(kFALSE),
+    fAccMin(0.),
+    fAccMax(0.),   
+    fMaxStepGas(0.),
+    fMaxStepAlu(0.),
+    fMaxDestepGas(0.),
+    fMaxDestepAlu(0.),
+    fMaxIterPad(0),
+    fCurIterPad(0),
+    fTriggerScalerEvent(kFALSE),
+    fTriggerResponseV1(kFALSE),
+    fTriggerCoinc44(0),
+    fTriggerEffCells(0),
+    fDigitizerWithNoise(kTRUE),
+    fRawWriter(0x0),
+    fDigitMaker(0x0)
+
+{
+/// Default Constructor
+    
+    AliDebug(1,Form("default (empty) ctor this=%p",this));
     fIshunt          = 0;
-    fHits            = 0;
-    fPadHits         = 0;
-    fNPadHits        = 0;
-    fChambers        = 0;
-    fDchambers       = 0;
-    fTriggerCircuits = 0;  
-    fNdch            = 0;
-    fRawClusters     = 0;
-    fNrawch          = 0;
-    fGlobalTrigger   = 0;
-    fNLocalTrigger   = 0;
-    fLocalTrigger    = 0;
-    fNLocalTrigger   = 0;
-    fAccMin          = 0.;
-    fAccMax          = 0.;   
-    fAccCut          = kFALSE;
 }
-//___________________________________________
-AliMUON::AliMUON(const char *name, const char *title)
-       : AliDetector(name,title)
-{
-//Begin_Html
-/*
-<img src="gif/alimuon.gif">
-*/
-//End_Html
-
-   fHits     = new TClonesArray("AliMUONHit",1000);
-   gAlice->AddHitList(fHits);
-   fPadHits = new TClonesArray("AliMUONPadHit",10000);
-   fNPadHits  =  0;
-   fIshunt     =  0;
-
-   fNCh             = AliMUONConstants::NCh(); 
-   fNTrackingCh     = AliMUONConstants::NTrackingCh();
-   fNdch            = new Int_t[fNCh];
-
-   fDchambers = new TObjArray(AliMUONConstants::NCh());
-
-   Int_t i;
-   
-   for (i=0; i<AliMUONConstants::NCh() ;i++) {
-       (*fDchambers)[i] = new TClonesArray("AliMUONDigit",10000); 
-       fNdch[i]=0;
-   }
-
-   fNrawch      = new Int_t[fNTrackingCh];
-
-   fRawClusters = new TObjArray(AliMUONConstants::NTrackingCh());
-
-   for (i=0; i<AliMUONConstants::NTrackingCh();i++) {
-       (*fRawClusters)[i] = new TClonesArray("AliMUONRawCluster",10000); 
-       fNrawch[i]=0;
-   }
-
-   fGlobalTrigger = new TClonesArray("AliMUONGlobalTrigger",1);    
-   fNGlobalTrigger = 0;
-   fLocalTrigger  = new TClonesArray("AliMUONLocalTrigger",234);    
-   fNLocalTrigger = 0;
-
-   SetMarkerColor(kRed);
-//
-//
-//
-//
 
-    Int_t ch;
+//__________________________________________________________________
+AliMUON::AliMUON(const char *name, const char* title)
+  : AliDetector(name, title),
+    fNCh(AliMUONConstants::NCh()),
+    fNTrackingCh(AliMUONConstants::NTrackingCh()),
+    fMUONData(0),
+    fSplitLevel(0),
+    fChambers(0),
+    fGeometryBuilder(0),
+    fSegmentation(0),
+    fAccCut(kFALSE),
+    fAccMin(0.),
+    fAccMax(0.),   
+    fMaxStepGas(0.1),
+    fMaxStepAlu(0.1),
+    fMaxDestepGas(-1), // Negatives values are ignored by geant3 CONS200 
+    fMaxDestepAlu(-1), // in the calculation of the tracking parameters
+    fMaxIterPad(0),
+    fCurIterPad(0),
+    fTriggerScalerEvent(kFALSE),
+    fTriggerResponseV1(kFALSE),
+    fTriggerCoinc44(0),
+    fTriggerEffCells(0),
+    fDigitizerWithNoise(kTRUE),
+    fRawWriter(0x0),
+    fDigitMaker(new AliMUONDigitMaker(kFALSE)) 
+{
+/// Standard constructor  
+  
+  AliDebug(1,Form("ctor this=%p",this));
+  fIshunt =  0;
 
+  //PH SetMarkerColor(kRed);//
+    
+  // Geometry builder
+  fGeometryBuilder = new AliMUONGeometryBuilder(this);
+  
+  // Common geometry definitions
+  fGeometryBuilder
+    ->AddBuilder(new AliMUONCommonGeometryBuilder(this));
+
+  // By default, add also all the needed geometry builders.
+  // If you want to change this from outside, please use ResetGeometryBuilder
+  // method, followed by AddGeometryBuilder ones.
+
+  AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(this));
+  AddGeometryBuilder(new AliMUONSt2GeometryBuilderV2(this));
+  AddGeometryBuilder(new AliMUONSlatGeometryBuilder(this));
+  AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(this));
+  
+  //
+  // Creating List of Chambers
+    Int_t ch;
     fChambers = new TObjArray(AliMUONConstants::NCh());
 
     // Loop over stations
     for (Int_t st = 0; st < AliMUONConstants::NCh() / 2; st++) {
       // Loop over 2 chambers in the station
-       for (Int_t stCH = 0; stCH < 2; stCH++) {
-//
-//    
-//    Default Parameters for Muon Tracking Stations
-
-
-           ch = 2 * st + stCH;
-//
-           if (ch < AliMUONConstants::NTrackingCh()) {
-               (*fChambers)[ch] = new AliMUONChamber(ch);
-           } else {
-               (*fChambers)[ch] = new AliMUONChamberTrigger(ch);
-           }
-           
-           AliMUONChamber* chamber = (AliMUONChamber*) (*fChambers)[ch];
-           
-           chamber->SetGid(0);
-           // Default values for Z of chambers
-           chamber->SetZ(AliMUONConstants::DefaultChamberZ(ch));
-//
-           chamber->InitGeo(AliMUONConstants::DefaultChamberZ(ch));
-//          Set chamber inner and outer radius to default
-           chamber->SetRInner(AliMUONConstants::Dmin(st)/2);
-           chamber->SetROuter(AliMUONConstants::Dmax(st)/2);
-//
-       } // Chamber stCH (0, 1) in 
+      for (Int_t stCH = 0; stCH < 2; stCH++) {
+       //
+       //    
+       //    Default Parameters for Muon Tracking Stations
+       ch = 2 * st + stCH;
+       if (ch < AliMUONConstants::NTrackingCh()) {
+         fChambers->AddAt(new AliMUONChamber(ch),ch);
+       } else {
+         fChambers->AddAt(new AliMUONChamberTrigger(ch, GetGeometryTransformer()),ch);
+       }
+      } // Chamber stCH (0, 1) in 
     }     // Station st (0...)
-    fMaxStepGas=0.01; 
-    fMaxStepAlu=0.1; 
-    fMaxDestepGas=-1;
-    fMaxDestepAlu=-1;
-//
-   fMaxIterPad   = 0;
-   fCurIterPad   = 0;
-//
-   fAccMin          = 0.;
-   fAccMax          = 0.;   
-   fAccCut          = kFALSE;
-
-   // cp new design of AliMUONTriggerDecision
-   fTriggerCircuits = new TObjArray(AliMUONConstants::NTriggerCircuit());
-   for (Int_t circ=0; circ<AliMUONConstants::NTriggerCircuit(); circ++) {
-     (*fTriggerCircuits)[circ] = new AliMUONTriggerCircuit();     
-   }
-   // cp new design of AliMUONTriggerDecision
 
 }
-//___________________________________________
-AliMUON::AliMUON(const AliMUON& rMUON)
-{
-// Dummy copy constructor
-    ;
-    
-}
 
+//____________________________________________________________________
 AliMUON::~AliMUON()
 {
-// Destructor
-    printf("Calling AliMUON destructor !!!\n");
-    
-    Int_t i;
-    fIshunt  = 0;
-    // Delete TObjArrays
-    if (fChambers){
-      fChambers->Delete();
-      delete fChambers;
-    }
-    if (fTriggerCircuits){
-      fTriggerCircuits->Delete();
-      delete fTriggerCircuits;
-    }
-    if (fDchambers){
-      fDchambers->Delete();
-      delete fDchambers;
-    }
-    if (fRawClusters){
-      fRawClusters->Delete();
-      delete fRawClusters;
-    }
-    for (i=0;i<AliMUONConstants::NTrackingCh();i++) {
-      fNrawch[i]=0;
-    }
-    // Delete TClonesArrays
-    if (fPadHits){
-      fPadHits->Delete();
-      delete fPadHits;
-    }
-    if (fGlobalTrigger){
-      fGlobalTrigger->Delete();
-      delete fGlobalTrigger;
-    }
-    fNGlobalTrigger = 0;
-    
-    if (fLocalTrigger){
-      fLocalTrigger->Delete();
-      delete fLocalTrigger;
-    }
-    fNLocalTrigger = 0;
-
-    if (fHits2){
-      fHits2->Delete();
-      delete fHits2;
-    }
-
-    if (fPadHits2){
-      fPadHits2->Delete();
-      delete fPadHits2;
-    }
-
-    if (fHits) {
-      fHits->Delete();
-      delete fHits;
-    }
+/// Destructor
 
-    // Delete hits tree for background event
-
-    if (fTrH1) {
-      fTrH1->Delete();
-      delete fTrH1;
-    }
-}
-//___________________________________________
-void AliMUON::AddHit(Int_t track, Int_t *vol, Float_t *hits)
-{
-  TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliMUONHit(fIshunt,track,vol,hits);
-}
-//___________________________________________
-void AliMUON::AddPadHit(Int_t *clhits)
-{
-   TClonesArray &lclusters = *fPadHits;
-   new(lclusters[fNPadHits++]) AliMUONPadHit(clhits);
-}
-//_____________________________________________________________________________
-void AliMUON::AddDigits(Int_t id, Int_t *tracks, Int_t *charges, Int_t *digits)
-{
-    //
-    // Add a MUON digit to the list
-    //
+  AliDebug(1,Form("dtor this=%p",this));
+  fIshunt  = 0;
 
-    TClonesArray &ldigits = *((TClonesArray*)(*fDchambers)[id]);
-    new(ldigits[fNdch[id]++]) AliMUONDigit(tracks,charges,digits);
+  if (fChambers){
+    fChambers->Delete();
+    delete fChambers;
+  }
+  
+  delete fMUONData;
+  delete fGeometryBuilder;
+  delete fSegmentation;
+  delete fRawWriter;
+  delete fDigitMaker;
 }
 
 //_____________________________________________________________________________
-void AliMUON::AddRawCluster(Int_t id, const AliMUONRawCluster& c)
+void AliMUON::AddGeometryBuilder(AliMUONVGeometryBuilder* geomBuilder)
 {
-    //
-    // Add a MUON digit to the list
-    //
-
-    TClonesArray &lrawcl = *((TClonesArray*)(*fRawClusters)[id]);
-    new(lrawcl[fNrawch[id]++]) AliMUONRawCluster(c);
-}
+/// Add the geometry builder to the list
 
-//___________________________________________
-void AliMUON::AddGlobalTrigger(Int_t *singlePlus, Int_t *singleMinus,
-                              Int_t *singleUndef,
-                              Int_t *pairUnlike, Int_t *pairLike)
-{
-// add a MUON Global Trigger to the list (only one GlobalTrigger per event !)
-  TClonesArray &globalTrigger = *fGlobalTrigger;
-  new(globalTrigger[fNGlobalTrigger++]) 
-    AliMUONGlobalTrigger(singlePlus, singleMinus,  singleUndef, pairUnlike, 
-                        pairLike);
-}
-//___________________________________________
-void AliMUON::AddLocalTrigger(Int_t *localtr)
-{
-// add a MUON Local Trigger to the list
-  TClonesArray &localTrigger = *fLocalTrigger;
-  new(localTrigger[fNLocalTrigger++]) AliMUONLocalTrigger(localtr);
+  fGeometryBuilder->AddBuilder(geomBuilder);
 }
 
-//___________________________________________
+//____________________________________________________________________
 void AliMUON::BuildGeometry()
 {
-// Geometry for event display
-  for (Int_t i=0; i<7; i++) {
-    for (Int_t j=0; j<2; j++) {
-      Int_t id=2*i+j+1;
-      this->Chamber(id-1).SegmentationModel(1)->Draw("eventdisplay");
-    }
-  }
-}
+/// Geometry for event display
 
-//___________________________________________
-Int_t AliMUON::DistancetoPrimitive(Int_t , Int_t )
-{
-   return 9999;
-}
 
-//___________________________________________
-void AliMUON::MakeBranch(Option_t* option, char *file)
-{
-    //
-    // Create Tree branches for the MUON.
-    //
-    const Int_t kBufferSize = 4000;
-    char branchname[30];
-    sprintf(branchname,"%sCluster",GetName());
-    
-    AliDetector::MakeBranch(option,file);
-    
-    char *cD = strstr(option,"D");
-    char *cR = strstr(option,"R");
-    char *cH = strstr(option,"H");
-
-    if (fPadHits   && gAlice->TreeH() && cH) {
-      gAlice->MakeBranchInTree(gAlice->TreeH(), 
-                               branchname, &fPadHits, kBufferSize, file) ;       
-         printf("Making Branch %s for clusters\n",branchname);
-    }
-    
-    if (cD) {
-      //
-      // one branch for digits per chamber
-      // 
-      Int_t i;
-    
-      for (i=0; i<AliMUONConstants::NCh() ;i++) {
-           sprintf(branchname,"%sDigits%d",GetName(),i+1);     
-           if (fDchambers   && gAlice->TreeD()) {
-          gAlice->MakeBranchInTree(gAlice->TreeD(), 
-                                   branchname, &((*fDchambers)[i]), kBufferSize, file) ;         
-             printf("Making Branch %s for digits in chamber %d\n",branchname,i+1);
-        }
-         }     
-    }
-    
-    if (cR) {
-      //     
-      // one branch for raw clusters per chamber
-      //  
-      printf("Make Branch - TreeR address %p\n",gAlice->TreeR());
-      
-      Int_t i;
-
-      for (i=0; i<AliMUONConstants::NTrackingCh() ;i++) {
-           sprintf(branchname,"%sRawClusters%d",GetName(),i+1);        
-           if (fRawClusters   && gAlice->TreeR()) {
-          gAlice->MakeBranchInTree(gAlice->TreeR(), 
-                                   branchname, &((*fRawClusters)[i]), kBufferSize, file) ;       
-             printf("Making Branch %s for raw clusters in chamber %d\n",branchname,i+1);
-           }   
-      }
-      //
-      // one branch for global trigger
-      //
-      sprintf(branchname,"%sGlobalTrigger",GetName());
-      if (fGlobalTrigger && gAlice->TreeR()) {  
-        gAlice->MakeBranchInTree(gAlice->TreeR(), 
-                                 branchname, &fGlobalTrigger, kBufferSize, file) ;       
-           printf("Making Branch %s for Global Trigger\n",branchname);
-      }
-      //
-      // one branch for local trigger
-      //  
-      sprintf(branchname,"%sLocalTrigger",GetName());
-      if (fLocalTrigger && gAlice->TreeR()) {  
-        gAlice->MakeBranchInTree(gAlice->TreeR(), 
-                                 branchname, &fLocalTrigger, kBufferSize, file) ;        
-           printf("Making Branch %s for Local Trigger\n",branchname);
-      }
-   }
+//     for (Int_t i = 0; i < AliMUONConstants::NCh(); i++)     
+//       this->Chamber(i).SegmentationModel2(1)->Draw("eventdisplay");// to be check !
+     
+  
 }
 
-//___________________________________________
-void AliMUON::SetTreeAddress()
+//____________________________________________________________________
+const AliMUONGeometry*  AliMUON::GetGeometry() const
 {
-  // Set branch address for the Hits and Digits Tree.
-  char branchname[30];
-  AliDetector::SetTreeAddress();
-
-  TBranch *branch;
-  TTree *treeH = gAlice->TreeH();
-  TTree *treeD = gAlice->TreeD();
-  TTree *treeR = gAlice->TreeR();
-
-  if (treeH) {
-    if (fPadHits) {
-      branch = treeH->GetBranch("MUONCluster");
-      if (branch) branch->SetAddress(&fPadHits);
-    }
-  }
+/// Return geometry parametrisation
 
-  if (treeD) {
-      for (int i=0; i<AliMUONConstants::NCh(); i++) {
-         sprintf(branchname,"%sDigits%d",GetName(),i+1);
-         if (fDchambers) {
-             branch = treeD->GetBranch(branchname);
-             if (branch) branch->SetAddress(&((*fDchambers)[i]));
-         }
-      }
+  if ( !fGeometryBuilder) {
+    AliWarningStream() << "GeometryBuilder not defined." << std::endl;
+    return 0;
   }
+  
+  return fGeometryBuilder->GetGeometry();
+}   
 
-  // printf("SetTreeAddress --- treeR address  %p \n",treeR);
-
-  if (treeR) {
-      for (int i=0; i<AliMUONConstants::NTrackingCh(); i++) {
-         sprintf(branchname,"%sRawClusters%d",GetName(),i+1);
-         if (fRawClusters) {
-             branch = treeR->GetBranch(branchname);
-             if (branch) branch->SetAddress(&((*fRawClusters)[i]));
-         }
-      }
-
-      if (fLocalTrigger) {
-       branch = treeR->GetBranch("MUONLocalTrigger");
-       if (branch) branch->SetAddress(&fLocalTrigger);
-      }
-      if (fGlobalTrigger) {
-       branch = treeR->GetBranch("MUONGlobalTrigger");
-       if (branch) branch->SetAddress(&fGlobalTrigger);
-      }
-  }
-}
-//___________________________________________
-void AliMUON::ResetHits()
-{
-  // Reset number of clusters and the cluster array for this detector
-  AliDetector::ResetHits();
-  fNPadHits = 0;
-  if (fPadHits) fPadHits->Clear();
-}
-
-//____________________________________________
-void AliMUON::ResetDigits()
-{
-    //
-    // Reset number of digits and the digits array for this detector
-    //
-    for ( int i=0;i<AliMUONConstants::NCh();i++ ) {
-       if ((*fDchambers)[i])    ((TClonesArray*)(*fDchambers)[i])->Clear();
-       if (fNdch)  fNdch[i]=0;
-    }
-}
-//____________________________________________
-void AliMUON::ResetRawClusters()
-{
-    //
-    // Reset number of raw clusters and the raw clust array for this detector
-    //
-    for ( int i=0;i<AliMUONConstants::NTrackingCh();i++ ) {
-       if ((*fRawClusters)[i])    ((TClonesArray*)(*fRawClusters)[i])->Clear();
-       if (fNrawch)  fNrawch[i]=0;
-    }
-}
-
-//____________________________________________
-void AliMUON::ResetTrigger()
-{
-  //  Reset Local and Global Trigger 
-  fNGlobalTrigger = 0;
-  if (fGlobalTrigger) fGlobalTrigger->Clear();
-  fNLocalTrigger = 0;
-  if (fLocalTrigger) fLocalTrigger->Clear();
-}
-
-//____________________________________________
-void AliMUON::SetPadSize(Int_t id, Int_t isec, Float_t p1, Float_t p2)
-{
-// Set the pad size for chamber id and cathode isec
-    Int_t i=2*(id-1);
-    ((AliMUONChamber*) (*fChambers)[i])  ->SetPadSize(isec,p1,p2);
-    ((AliMUONChamber*) (*fChambers)[i+1])->SetPadSize(isec,p1,p2);
-}
-
-//___________________________________________
-void AliMUON::SetChambersZ(const Float_t *Z)
+//____________________________________________________________________
+const AliMUONGeometryTransformer*  AliMUON::GetGeometryTransformer() const
 {
-  // Set Z values for all chambers (tracking and trigger)
-  // from the array pointed to by "Z"
-    for (Int_t ch = 0; ch < AliMUONConstants::NCh(); ch++)
-       ((AliMUONChamber*) ((*fChambers)[ch]))->SetZ(Z[ch]);
-    return;
-}
+/// Return geometry parametrisation
 
-//___________________________________________
-void AliMUON::SetChambersZToDefault()
-{
-  // Set Z values for all chambers (tracking and trigger)
-  // to default values
-  SetChambersZ(AliMUONConstants::DefaultChamberZ());
-  return;
+  const AliMUONGeometry* kGeometry = GetGeometry();
+  
+  if ( !kGeometry) return 0;
+
+  return kGeometry->GetTransformer();
+}   
+
+//__________________________________________________________________
+void  AliMUON::SetTreeAddress()
+{
+/// Set Hits tree address
+
+  GetMUONData()->SetLoader(fLoader); 
+  //  GetMUONData()->MakeBranch("D,S,RC");
+  //  GetMUONData()->SetTreeAddress("H,D,S,RC");
+  GetMUONData()->SetTreeAddress("H");
+  if (fHits !=  GetMUONData()->Hits())  {
+    if ( gAlice->GetMCApp() )
+      if ( gAlice->GetMCApp()->GetHitLists() ) {
+       fHits = GetMUONData()->Hits();
+       gAlice->GetMCApp()->AddHitList(fHits); // For purifyKine, only necessary when Hit list is created in AliMUONData
+      }  
+  }
+  fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector    
 }
 
-//___________________________________________
+//_________________________________________________________________
 void AliMUON::SetChargeSlope(Int_t id, Float_t p1)
 {
-// Set the inverse charge slope for chamber id
-    Int_t i=2*(id-1);
-    ((AliMUONChamber*) (*fChambers)[i])->SetChargeSlope(p1);
-    ((AliMUONChamber*) (*fChambers)[i+1])->SetChargeSlope(p1);
-}
+/// Set the inverse charge slope for chamber id
 
-//___________________________________________
+    Int_t i=2*(id-1);    //PH    ((AliMUONChamber*) (*fChambers)[i])->SetSigmaIntegration(p1);
+    //PH    ((AliMUONChamber*) (*fChambers)[i+1])->SetSigmaIntegration(p1);
+    ((AliMUONChamber*) fChambers->At(i))->SetChargeSlope(p1);
+    ((AliMUONChamber*) fChambers->At(i+1))->SetChargeSlope(p1);
+}
+//__________________________________________________________________
 void AliMUON::SetChargeSpread(Int_t id, Float_t p1, Float_t p2)
 {
-// Set sigma of charge spread for chamber id
+/// Set sigma of charge spread for chamber id
+
     Int_t i=2*(id-1);
-    ((AliMUONChamber*) (*fChambers)[i])->SetChargeSpread(p1,p2);
-    ((AliMUONChamber*) (*fChambers)[i+1])->SetChargeSpread(p1,p2);
+    ((AliMUONChamber*) fChambers->At(i))->SetChargeSpread(p1,p2);
+    ((AliMUONChamber*) fChambers->At(i+1))->SetChargeSpread(p1,p2);
 }
-
-//___________________________________________
+//___________________________________________________________________
 void AliMUON::SetSigmaIntegration(Int_t id, Float_t p1)
 {
-// Set integration limits for charge spread
+/// Set integration limits for charge spread
     Int_t i=2*(id-1);
-    ((AliMUONChamber*) (*fChambers)[i])->SetSigmaIntegration(p1);
-    ((AliMUONChamber*) (*fChambers)[i+1])->SetSigmaIntegration(p1);
+    ((AliMUONChamber*) fChambers->At(i))->SetSigmaIntegration(p1);
+    ((AliMUONChamber*) fChambers->At(i+1))->SetSigmaIntegration(p1);
 }
 
-//___________________________________________
+//__________________________________________________________________
 void AliMUON::SetMaxAdc(Int_t id, Int_t p1)
 {
-// Set maximum number for ADCcounts (saturation)
+/// Set maximum number for ADCcounts (saturation)
+
     Int_t i=2*(id-1);
-    ((AliMUONChamber*) (*fChambers)[i])->SetMaxAdc(p1);
-    ((AliMUONChamber*) (*fChambers)[i+1])->SetMaxAdc(p1);
+    ((AliMUONChamber*) fChambers->At(i))->SetMaxAdc(p1);
+    ((AliMUONChamber*) fChambers->At(i+1))->SetMaxAdc(p1);
 }
 
-//___________________________________________
+//__________________________________________________________________
 void AliMUON::SetMaxStepGas(Float_t p1)
 {
-// Set stepsize in gas
-     fMaxStepGas=p1;
-}
+/// Set stepsize in gas
 
-//___________________________________________
+  fMaxStepGas=p1;
+}
+//__________________________________________________________________
 void AliMUON::SetMaxStepAlu(Float_t p1)
 {
-// Set step size in Alu
+/// Set step size in Alu
+
     fMaxStepAlu=p1;
 }
-
-//___________________________________________
+//__________________________________________________________________
 void AliMUON::SetMaxDestepGas(Float_t p1)
 {
-// Set maximum step size in Gas
+/// Set maximum step size in Gas
+
     fMaxDestepGas=p1;
 }
-
-//___________________________________________
+//__________________________________________________________________
 void AliMUON::SetMaxDestepAlu(Float_t p1)
 {
-// Set maximum step size in Alu
-    fMaxDestepAlu=p1;
-}
-//___________________________________________
-void AliMUON::SetAcceptance(Bool_t acc, Float_t angmin, Float_t angmax)
-{
-// Set acceptance cuts 
-   fAccCut=acc;
-   fAccMin=angmin*TMath::Pi()/180;
-   fAccMax=angmax*TMath::Pi()/180;
-   Int_t ch;
-   if (acc) {
-       for (Int_t st = 0; st < AliMUONConstants::NCh() / 2; st++) {
-          // Loop over 2 chambers in the station
-          for (Int_t stCH = 0; stCH < 2; stCH++) {
-              ch = 2 * st + stCH;
-//         Set chamber inner and outer radius according to acceptance cuts
-              Chamber(ch).SetRInner(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMin));
-              Chamber(ch).SetROuter(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMax));
-          } // chamber loop
-       } // station loop
-   }
-}
-//___________________________________________
-void   AliMUON::SetSegmentationModel(Int_t id, Int_t isec, AliSegmentation *segmentation)
-{
-// Set the segmentation for chamber id cathode isec
-    ((AliMUONChamber*) (*fChambers)[id])->SetSegmentationModel(isec, segmentation);
+/// Set maximum step size in Alu
 
+  fMaxDestepAlu=p1;
 }
-//___________________________________________
-void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
+
+//____________________________________________________________________
+Float_t  AliMUON::GetMaxStepGas() const
 {
-// Set the response for chamber id
-    ((AliMUONChamber*) (*fChambers)[id])->SetResponseModel(response);
-}
+/// Return stepsize in gas
+  
+  return fMaxStepGas;
+}  
 
-void   AliMUON::SetReconstructionModel(Int_t id, AliMUONClusterFinderVS *reconst)
+//____________________________________________________________________
+Float_t  AliMUON::GetMaxStepAlu() const
 {
-// Set ClusterFinder for chamber id
-    ((AliMUONChamber*) (*fChambers)[id])->SetReconstructionModel(reconst);
+/// Return step size in Alu
+  
+  return fMaxStepAlu;
 }
-
-void   AliMUON::SetNsec(Int_t id, Int_t nsec)
+  
+//____________________________________________________________________
+Float_t  AliMUON::GetMaxDestepGas() const
 {
-// Set number of segmented cathods for chamber id
-    ((AliMUONChamber*) (*fChambers)[id])->SetNsec(nsec);
+/// Return maximum step size in Gas
+  
+  return fMaxDestepGas;
 }
-
-//___________________________________________
-void AliMUON::SDigits2Digits()
+  
+//____________________________________________________________________
+Float_t  AliMUON::GetMaxDestepAlu() const
 {
-    Int_t evNumber2=0, ibg=0, bgr=0;
-    Int_t nbgr_ev= 0, nev=0;
-
-    Int_t nparticles = gAlice->GetNtrack();
-    cout << "nev         " <<nev<<endl;
-    cout << "nparticles  " <<nparticles<<endl; 
-    if (nparticles <= 0) return;
-
-    nbgr_ev = Int_t(nev*bgr/(evNumber2+1));
-       
-    if (ibg) {
-         printf("nbgr_ev %d\n",nbgr_ev);
-         Digitise(nev,nbgr_ev,"Add"," ","galice_bgr.root");
-    } 
-       else {
-         Digitise(nev,nbgr_ev,"rien","",""); 
-    }
+/// Return maximum step size in Gas
+  
+  return fMaxDestepAlu;
 }
 
-//___________________________________________
-void AliMUON::MakePadHits(Float_t xhit,Float_t yhit, Float_t zhit,
-                         Float_t eloss, Float_t tof,  Int_t idvol)
+//____________________________________________________________________
+ void  AliMUON::SetAlign(Bool_t align)
 {
-//
-//  Calls the charge disintegration method of the current chamber and adds
-//  the simulated cluster to the root treee 
-//
-    Int_t clhits[7];
-    Float_t newclust[6][500];
-    Int_t nnew;
-    
-    
-//
-//  Integrated pulse height on chamber
+/// Set option for alignement to geometry builder
+   fGeometryBuilder->SetAlign(align);
+}   
 
-    
-    clhits[0]=fNhits+1;
-//
-//
-//    if (idvol == 6) printf("\n ->Disintegration %f %f %f", xhit, yhit, eloss );
-    
+//____________________________________________________________________
+ void  AliMUON::SetAlign(const TString& fileName, Bool_t align)
+{
+/// Set option for alignement to geometry builder
+   fGeometryBuilder->SetAlign(fileName, align);
+}   
 
-    ((AliMUONChamber*) (*fChambers)[idvol])
-       ->DisIntegration(eloss, tof, xhit, yhit, zhit, nnew, newclust);
-    Int_t ic=0;
-//    if (idvol == 6) printf("\n nnew  %d \n", nnew);
-//
-//  Add new clusters
-    for (Int_t i=0; i<nnew; i++) {
-       if (Int_t(newclust[3][i]) > 0) {
-           ic++;
-// Cathode plane
-           clhits[1] = Int_t(newclust[5][i]);
-//  Cluster Charge
-           clhits[2] = Int_t(newclust[0][i]);
-//  Pad: ix
-           clhits[3] = Int_t(newclust[1][i]);
-//  Pad: iy 
-           clhits[4] = Int_t(newclust[2][i]);
-//  Pad: charge
-           clhits[5] = Int_t(newclust[3][i]);
-//  Pad: chamber sector
-           clhits[6] = Int_t(newclust[4][i]);
-           
-           AddPadHit(clhits);
-       }
-    }
+//____________________________________________________________________
+void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
+{
+/// Set the response for chamber id
+    ((AliMUONChamber*) fChambers->At(id))->SetResponseModel(response);
 }
 
-//----------------------------------------------------------------------
-
-void AliMUON::Digitise(Int_t nev,Int_t bgrEvent,Option_t *option,Option_t *opt,Text_t *filename)
+//____________________________________________________________________
+AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
 {
-    // keep galice.root for signal and name differently the file for 
-    // background when add! otherwise the track info for signal will be lost !
+/// Return digitizer
   
-    static Bool_t first=kTRUE;
-    static TFile *file;
-    char *addBackground = strstr(option,"Add");
-
+  return new AliMUONDigitizerV3(manager, fDigitizerWithNoise);
+}
 
-    AliMUONChamber*   iChamber;
-    AliSegmentation*  segmentation;
+//_____________________________________________________________________
+void AliMUON::SDigits2Digits()
+{
+/// Write TreeD here only 
 
-    
-    Int_t trk[50];
-    Int_t chtrk[50];  
-    TObjArray *list=new TObjArray;
-    static TClonesArray *pAddress=0;
-    if(!pAddress) pAddress=new TClonesArray("TVector",1000);
-    Int_t digits[5]; 
-
-    AliMUON *pMUON  = (AliMUON *) gAlice->GetModule("MUON");
-    AliHitMap** hitMap= new AliHitMap* [AliMUONConstants::NCh()];
-    for (Int_t i=0; i<AliMUONConstants::NCh(); i++) {hitMap[i]=0;}
-    if (addBackground ) {
-       if(first) {
-           fFileName=filename;
-           cout<<"filename"<<fFileName<<endl;
-           file=new TFile(fFileName);
-           cout<<"I have opened "<<fFileName<<" file "<<endl;
-           fHits2     = new TClonesArray("AliMUONHit",1000  );
-           fPadHits2 = new TClonesArray("AliMUONPadHit",10000);
-       }           
-       first=kFALSE;
-       file->cd();
-       //file->ls();
-       // Get Hits Tree header from file
-       if(fHits2) fHits2->Clear();
-       if(fPadHits2) fPadHits2->Clear();
-       if(fTrH1) delete fTrH1;
-       fTrH1=0;
-       
-       char treeName[20];
-       sprintf(treeName,"TreeH%d",bgrEvent);
-       fTrH1 = (TTree*)gDirectory->Get(treeName);
-       if (!fTrH1) {
-           printf("ERROR: cannot find Hits Tree for event:%d\n",bgrEvent);
-       }
-       // Set branch addresses
-       TBranch *branch;
-       char branchname[20];
-       sprintf(branchname,"%s",GetName());
-       if (fTrH1 && fHits2) {
-           branch = fTrH1->GetBranch(branchname);
-           if (branch) branch->SetAddress(&fHits2);
-       }
-       if (fTrH1 && fPadHits2) {
-           branch = fTrH1->GetBranch("MUONCluster");
-           if (branch) branch->SetAddress(&fPadHits2);
-       }
-    }
-    //
-    // loop over cathodes
-    //
-    AliHitMap* hm;
-    Int_t countadr = 0;
-    for (int icat = 0; icat < 2; icat++) { 
-       Int_t counter = 0;
-       Int_t * nmuon = new Int_t [AliMUONConstants::NCh()];
-       for (Int_t i = 0; i < AliMUONConstants::NCh(); i++) {
-           iChamber = (AliMUONChamber*) (*fChambers)[i];
-           if (iChamber->Nsec() == 1 && icat == 1) {
-               continue;
-           } else {
-               segmentation = iChamber->SegmentationModel(icat+1);
-           }
-           hitMap[i] = new AliMUONHitMapA1(segmentation, list);
-           nmuon[i]  = 0;
-       }
-       //printf("Start loop over tracks \n");     
-//
-//   Loop over tracks
-//
-
-       TTree *treeH  = gAlice->TreeH();
-       Int_t ntracks = (Int_t) treeH->GetEntries();
-       Int_t jj;
-       Int_t nmaxmuon = 5;
-
-       Float_t ** xhit = new Float_t * [AliMUONConstants::NCh()];
-       for (jj = 0; jj < AliMUONConstants::NCh(); jj++)
-         xhit[jj] = new Float_t[nmaxmuon];
-       Float_t ** yhit = new Float_t * [AliMUONConstants::NCh()];
-       for (jj=0; jj<AliMUONConstants::NCh(); jj++)
-         yhit[jj] = new Float_t[nmaxmuon];
-
-       for (Int_t track = 0; track < ntracks; track++) {
-           gAlice->ResetHits();
-           treeH->GetEvent(track);
-//
-//   Loop over hits
-           for(AliMUONHit* mHit = (AliMUONHit*)pMUON->FirstHit(-1); 
-               mHit;
-               mHit = (AliMUONHit*)pMUON->NextHit()) 
-           {
-               Int_t   nch   = mHit->Chamber()-1;  // chamber number
-               if (nch > AliMUONConstants::NCh()-1) continue;
-//             if (nch > 9) continue;
-               iChamber = &(pMUON->Chamber(nch));
-                // new 17.07.99
-               if (addBackground) {
-
-                   if (mHit->Particle()    == kMuonPlus 
-                       || mHit->Particle() == kMuonMinus) {
-                     // mark muon hits
-                     if (nmuon[nch] < nmaxmuon) {
-                       xhit[nch][nmuon[nch]] = mHit->X();
-                       yhit[nch][nmuon[nch]] = mHit->Y();
-                       nmuon[nch]++;
-                     }
-                     // ignore muon if too many compared to nmaxmuon
-                     else printf("AliMUON::Digitize: nmuon %d ==> ignored\n",nmuon[nch]);
-                   }
-               }
-               
-
-
-               
-//
-// Loop over pad hits
-               for (AliMUONPadHit* mPad =
-                        (AliMUONPadHit*)pMUON->FirstPad(mHit,fPadHits);
-                    mPad;
-                    mPad = (AliMUONPadHit*)pMUON->NextPad(fPadHits))
-               {
-                   Int_t cathode  = mPad->Cathode();     // cathode number
-                   Int_t ipx      = mPad->PadX();        // pad number on X
-                   Int_t ipy      = mPad->PadY();        // pad number on Y
-                   Int_t iqpad    = mPad->QPad();        // charge per pad
-//                 printf("\n Pad: %d %d %d %d", ipx, ipy, cathode,nch);
-//
-//
-                   
-                   if (cathode != (icat+1)) continue;
-                   // fill the info array
-                   segmentation = iChamber->SegmentationModel(cathode);
-                   new((*pAddress)[countadr++]) TVector(2);
-                   TVector &trinfo = *((TVector*) (*pAddress)[countadr-1]);
-                   trinfo(0) = (Float_t)track;
-                   trinfo(1) = (Float_t)iqpad;
-
-                   digits[0] = ipx;
-                   digits[1] = ipy;
-                   digits[2] = icat;
-                   digits[3] = iqpad;
-                   digits[4] = iqpad;
-
-                   if (mHit->Particle() == kMuonPlus ||
-                       mHit->Particle() == kMuonMinus) {
-                       digits[5] = mPad->HitNumber();
-                   } else digits[5] = -1;
-
-                   AliMUONTransientDigit* pdigit;
-                   // build the list of fired pads and update the info
-                   if (!hitMap[nch]->TestHit(ipx, ipy)) {
-
-                       list->AddAtAndExpand(
-                           new AliMUONTransientDigit(nch,digits),counter);
-                       
-                       hitMap[nch]->SetHit(ipx, ipy, counter);
-                       counter++;
-                       pdigit=(AliMUONTransientDigit*)list->At(list->GetLast());
-                       // list of tracks
-                       TObjArray *trlist = (TObjArray*)pdigit->TrackList();
-                       trlist->Add(&trinfo);
-                   } else {
-                       pdigit=(AliMUONTransientDigit*) hitMap[nch]->GetHit(ipx, ipy);
-                       // update charge
-                       (*pdigit).AddSignal(iqpad);
-                       (*pdigit).AddPhysicsSignal(iqpad);                      
-                       // update list of tracks
-                       TObjArray* trlist = (TObjArray*)pdigit->TrackList();
-                       Int_t lastEntry   = trlist->GetLast();
-                       TVector *pTrack   = (TVector*)trlist->At(lastEntry);
-                       TVector &ptrk     = *pTrack;
-                       Int_t lastTrack   = Int_t(ptrk(0));
-                       Int_t lastCharge  = Int_t(ptrk(1));
-                       if (lastTrack == track) {
-                           lastCharge += iqpad;
-                           trlist->RemoveAt(lastEntry);
-                           trinfo(0) = lastTrack;
-                           trinfo(1) = lastCharge;
-                           trlist->AddAt(&trinfo,lastEntry);
-                       } else {
-                           trlist->Add(&trinfo);
-                       }
-                       // check the track list
-                       Int_t nptracks = trlist->GetEntriesFast();
-                       if (nptracks > 2) {
-                           for (Int_t tr = 0; tr < nptracks; tr++) {
-                               TVector *ppTrack = (TVector*)trlist->At(tr);
-                               TVector &pptrk   = *ppTrack;
-                               trk[tr]   = Int_t(pptrk(0));
-                               chtrk[tr] = Int_t(pptrk(1));
-                           }
-                       } // end if nptracks
-                   } //  end if pdigit
-               } //end loop over clusters
-           } // hit loop
-       } // track loop
-
-       // open the file with background
-       
-       if (addBackground) {
-           ntracks = (Int_t)fTrH1->GetEntries();
-//
-//   Loop over tracks
-//
-           for (Int_t track = 0; track < ntracks; track++) {
-
-               if (fHits2)       fHits2->Clear();
-               if (fPadHits2)    fPadHits2->Clear();
-
-               fTrH1->GetEvent(track);
-//
-//   Loop over hits
-               AliMUONHit* mHit;
-               for(int i = 0; i < fHits2->GetEntriesFast(); ++i) 
-               {       
-                   mHit=(AliMUONHit*) (*fHits2)[i];
-                   Int_t   nch   = mHit->Chamber()-1;  // chamber number
-                   if (nch > 9) continue;
-                   iChamber = &(pMUON->Chamber(nch));
-//                 Int_t rmin = (Int_t)iChamber->RInner();
-//                 Int_t rmax = (Int_t)iChamber->ROuter();
-                    Float_t xbgr = mHit->X();
-                   Float_t ybgr = mHit->Y();
-                   Bool_t cond  = kFALSE;
-                   
-                   for (Int_t imuon = 0; imuon < nmuon[nch]; imuon++) {
-                       Float_t dist = (xbgr-xhit[nch][imuon])*(xbgr-xhit[nch][imuon])
-                           +(ybgr-yhit[nch][imuon])*(ybgr-yhit[nch][imuon]);
-                       if (dist<100) cond = kTRUE;
-                   }
-                   if (!cond) continue;
-                   
-//
-// Loop over pad hits
-                   for (AliMUONPadHit* mPad=
-                            (AliMUONPadHit*)pMUON->FirstPad(mHit,fPadHits2);
-                        mPad;
-                        mPad=(AliMUONPadHit*)pMUON->NextPad(fPadHits2))
-                   {
-                       //                  mPad = (AliMUONPadHit*) (*fPadHits2)[j];
-                       Int_t cathode  = mPad->Cathode();    // cathode number
-                       Int_t ipx      = mPad->PadX();       // pad number on X
-                       Int_t ipy      = mPad->PadY();       // pad number on Y
-                       Int_t iqpad    = mPad->QPad();       // charge per pad
-
-                       if (cathode != (icat+1)) continue;
-                       new((*pAddress)[countadr++]) TVector(2);
-                       TVector &trinfo=*((TVector*) (*pAddress)[countadr-1]);
-                       trinfo(0) = -1;  // tag background
-                       trinfo(1) = -1;
-                       
-                       digits[0] = ipx;
-                       digits[1] = ipy;
-                       digits[2] = icat;
-                       digits[3] = iqpad;
-                       digits[4] =  0;
-                       digits[5] = -1;
-                       
-                       AliMUONTransientDigit* pdigit;
-                       // build the list of fired pads and update the info
-                       if (!hitMap[nch]->TestHit(ipx, ipy)) {
-                           list->AddAtAndExpand(new AliMUONTransientDigit(nch,digits),counter);
-                           
-                           hitMap[nch]->SetHit(ipx, ipy, counter);
-                           counter++;
-                           
-                           pdigit=(AliMUONTransientDigit*)list->At(list->GetLast());
-                           // list of tracks
-                           TObjArray *trlist=(TObjArray*)pdigit->
-                               TrackList();
-                           trlist->Add(&trinfo);
-                       } else {
-                           pdigit = (AliMUONTransientDigit*) hitMap[nch]->GetHit(ipx, ipy);
-                           // update charge
-                           (*pdigit).AddSignal(iqpad);
-                           
-                           // update list of tracks
-                           TObjArray* trlist = (TObjArray*)pdigit->
-                               TrackList();
-                           Int_t lastEntry = trlist->GetLast();
-                           TVector *pTrack = (TVector*)trlist->
-                               At(lastEntry);
-                           TVector &ptrk = *pTrack;
-                           Int_t lastTrack = Int_t(ptrk(0));
-                           if (lastTrack == -1) {
-                               continue;
-                           } else {
-                               trlist->Add(&trinfo);
-                           }
-                               // check the track list
-                           Int_t nptracks = trlist->GetEntriesFast();
-                           if (nptracks > 0) {
-                               for (Int_t tr=0;tr<nptracks;tr++) {
-                                   TVector *ppTrack = (TVector*)trlist->At(tr);
-                                   TVector &pptrk = *ppTrack;
-                                   trk[tr] = Int_t(pptrk(0));
-                                   chtrk[tr] = Int_t(pptrk(1));
-                               }
-                           } // end if nptracks
-                       } //  end if pdigit
-                   } //end loop over clusters
-               } // hit loop
-           } // track loop
-
-           TTree *fAli=gAlice->TreeK();
-            TFile *file=NULL;
-           
-           if (fAli) file =fAli->GetCurrentFile();
-           file->cd();
-       } // if addBackground
-
-       delete [] xhit;
-       delete [] yhit;
-
-       Int_t tracks[10];
-       Int_t charges[10];
-       Int_t nentries=list->GetEntriesFast();
-       
-       for (Int_t nent = 0; nent < nentries; nent++) {
-           AliMUONTransientDigit *address = (AliMUONTransientDigit*)list->At(nent);
-           if (address == 0) continue;
-           Int_t ich = address->Chamber();
-           Int_t   q = address->Signal(); 
-           iChamber = (AliMUONChamber*) (*fChambers)[ich];
-//
-//  Digit Response (noise, threshold, saturation, ...)
-
-           AliMUONResponse * response = iChamber->ResponseModel();
-           q=response->DigitResponse(q);
-           
-           if (!q) continue;
-           
-           digits[0] = address->PadX();
-           digits[1] = address->PadY();
-           digits[2] = address->Cathode();
-           digits[3] = q;
-           digits[4] = address->Physics();
-           digits[5] = address->Hit();
-           
-           TObjArray* trlist = (TObjArray*)address->TrackList();
-           Int_t nptracks = trlist->GetEntriesFast();
-
-           // this was changed to accomodate the real number of tracks
-           if (nptracks > 10) {
-               cout<<"Attention - nptracks > 10 "<<nptracks<<endl;
-               nptracks=10;
-           }
-           if (nptracks > 2) {
-               printf("Attention - nptracks > 2  %d \n",nptracks);
-               printf("cat,ich,ix,iy,q %d %d %d %d %d \n",icat,ich,digits[0],digits[1],q);
-           }
-           for (Int_t tr=0;tr<nptracks;tr++) {
-               TVector *ppP = (TVector*)trlist->At(tr);
-               if(!ppP ) printf("ppP - %p\n",ppP);
-               TVector &pp  = *ppP;
-               tracks[tr]   = Int_t(pp(0));
-               charges[tr]  = Int_t(pp(1));
-                //printf("tracks, charges - %d %d\n",tracks[tr],charges[tr]);
-           }      //end loop over list of tracks for one pad
-            // Sort list of tracks according to charge
-           if (nptracks > 1) {
-               SortTracks(tracks,charges,nptracks);
-           }
-           if (nptracks < 10 ) {
-               for (Int_t i=nptracks; i<10; i++) {
-                   tracks[i]  = 0;
-                   charges[i] = 0;
-               }
-           }
-           
-           // fill digits
-           pMUON->AddDigits(ich,tracks,charges,digits);
-           // delete trlist;
-       }
-       //cout<<"I'm out of the loops for digitisation"<<endl;
-       //      gAlice->GetEvent(nev);
-       gAlice->TreeD()->Fill();
-       pMUON->ResetDigits();
-       list->Delete();
-
-       
-       for(Int_t ii=0; ii<AliMUONConstants::NCh(); ++ii) {
-           if (hitMap[ii]) {
-               hm = hitMap[ii];
-               delete hm;
-               hitMap[ii] = 0;
-           }
-       }
-       delete [] nmuon;    
-    } //end loop over cathodes
-    delete [] hitMap;
     char hname[30];
-    sprintf(hname,"TreeD%d",nev);
-    gAlice->TreeD()->Write(hname,TObject::kOverwrite);
-    // reset tree
-    gAlice->TreeD()->Reset();
-    delete list;
-    
-    pAddress->Delete();
-    // gObjectTable->Print();
+    //    sprintf(hname,"TreeD%d",fLoader->GetHeader()->GetEvent());
+    fLoader->TreeD()->Write(hname,TObject::kOverwrite);
+    fLoader->TreeD()->Reset();
 }
 
-void AliMUON::SortTracks(Int_t *tracks,Int_t *charges,Int_t ntr)
+//_____________________________________________________________________
+void AliMUON::Hits2SDigits()
 {
-  //
-  // Sort the list of tracks contributing to a given digit
-  // Only the 3 most significant tracks are acctually sorted
-  //
-  
-  //
-  //  Loop over signals, only 3 times
-  //
-  
-  Int_t qmax;
-  Int_t jmax;
-  Int_t idx[3] = {-2,-2,-2};
-  Int_t jch[3] = {-2,-2,-2};
-  Int_t jtr[3] = {-2,-2,-2};
-  Int_t i,j,imax;
-  
-  if (ntr<3) imax=ntr;
-  else imax=3;
-  for(i=0;i<imax;i++){
-    qmax=0;
-    jmax=0;
-    
-    for(j=0;j<ntr;j++){
-      
-      if((i == 1 && j == idx[i-1]) 
-        ||(i == 2 && (j == idx[i-1] || j == idx[i-2]))) continue;
-      
-      if(charges[j] > qmax) {
-       qmax = charges[j];
-       jmax=j;
-      }       
-    } 
-    
-    if(qmax > 0) {
-      idx[i]=jmax;
-      jch[i]=charges[jmax]; 
-      jtr[i]=tracks[jmax]; 
-    }
-    
-  } 
+/// Perform Hits2Digits using SDigitizerV2
   
-  for(i=0;i<3;i++){
-    if (jtr[i] == -2) {
-         charges[i]=0;
-         tracks[i]=0;
-    } else {
-         charges[i]=jch[i];
-         tracks[i]=jtr[i];
-    }
-  }
-
+  TTask* sdigitizer = new AliMUONSDigitizerV2;
+  sdigitizer->ExecuteTask();
 }
 
-//___________________________________________
-void AliMUON::Trigger(Int_t nev){
-// call the Trigger Algorithm and fill TreeR
-
-  Int_t singlePlus[3]  = {0,0,0}; 
-  Int_t singleMinus[3] = {0,0,0}; 
-  Int_t singleUndef[3] = {0,0,0};
-  Int_t pairUnlike[3]  = {0,0,0}; 
-  Int_t pairLike[3]    = {0,0,0};
-
-  ResetTrigger();
-  AliMUONTriggerDecision* decision= new AliMUONTriggerDecision(1);
-  decision->Trigger();   
-  decision->GetGlobalTrigger(singlePlus, singleMinus, singleUndef,
-                            pairUnlike, pairLike);
-// add a local trigger in the list 
-  AddGlobalTrigger(singlePlus, singleMinus, singleUndef, pairUnlike, pairLike);
-  Int_t i;
+//_____________________________________________________________________
+void AliMUON::Digits2Raw()
+{
+/// Convert digits of the current event to raw data
+
+  if (!fRawWriter)
+  {
+    fRawWriter = new AliMUONRawWriter(fMUONData);
+    if (fTriggerScalerEvent == kTRUE) 
+    {
+      fRawWriter->SetScalersNumbers();
+    }
+  }
   
-  for (Int_t icirc=0; icirc<AliMUONConstants::NTriggerCircuit(); icirc++) { 
-      if(decision->GetITrigger(icirc)==1) {
-         Int_t localtr[7]={0,0,0,0,0,0,0};      
-         Int_t loLpt[2]={0,0}; Int_t loHpt[2]={0,0}; Int_t loApt[2]={0,0};
-         decision->GetLutOutput(icirc, loLpt, loHpt, loApt);
-         localtr[0] = icirc;
-         localtr[1] = decision->GetStripX11(icirc);
-         localtr[2] = decision->GetDev(icirc);
-         localtr[3] = decision->GetStripY11(icirc);
-         for (i=0; i<2; i++) {    // convert the Lut output in 1 digit 
-             localtr[4] = localtr[4]+Int_t(loLpt[i]*TMath::Power(2,i));
-             localtr[5] = localtr[5]+Int_t(loHpt[i]*TMath::Power(2,i));
-             localtr[6] = localtr[6]+Int_t(loApt[i]*TMath::Power(2,i));
-         }
-         AddLocalTrigger(localtr);  // add a local trigger in the list
-      }
+  if (!fRawWriter->Digits2Raw()) 
+  {
+    AliError("pb writting raw data");
   }
-  delete decision;
-
-  gAlice->TreeR()->Fill();
-  ResetTrigger();
-  char hname[30];
-  sprintf(hname,"TreeR%d",nev);
-  gAlice->TreeR()->Write(hname,TObject::kOverwrite);
-  gAlice->TreeR()->Reset();
-  printf("\n End of trigger for event %d", nev);
 }
 
-
-//____________________________________________
-void AliMUON::FindClusters(Int_t nev,Int_t lastEntry)
+//_____________________________________________________________________
+Bool_t AliMUON::Raw2SDigits(AliRawReader* rawReader)
 {
-//
-//  Perform cluster finding
-//
-    TClonesArray *dig1, *dig2;
-    Int_t ndig, k;
-    dig1 = new TClonesArray("AliMUONDigit",1000);
-    dig2 = new TClonesArray("AliMUONDigit",1000);
-    AliMUONDigit *digit;
-//
-// Loop on chambers and on cathode planes
-//
-    
-    for (Int_t ich = 0; ich < 10; ich++) {
-       AliMUONChamber* iChamber = (AliMUONChamber*) (*fChambers)[ich];
-       AliMUONClusterFinderVS* rec = iChamber->ReconstructionModel();    
-       gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(lastEntry);
-       TClonesArray *muonDigits = this->DigitsAddress(ich);
-       ndig=muonDigits->GetEntriesFast();
-       printf("\n 1 Found %d digits in %p %d", ndig, muonDigits,ich);
-       TClonesArray &lhits1 = *dig1;
-       Int_t n = 0;
-       for (k = 0; k < ndig; k++) {
-           digit = (AliMUONDigit*) muonDigits->UncheckedAt(k);
-           if (rec->TestTrack(digit->Track(0)))
-               new(lhits1[n++]) AliMUONDigit(*digit);
-       }
-       gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(lastEntry+1);
-       muonDigits  = this->DigitsAddress(ich);
-       ndig=muonDigits->GetEntriesFast();
-       printf("\n 2 Found %d digits in %p %d", ndig, muonDigits, ich);
-       TClonesArray &lhits2 = *dig2;
-       n=0;
-       
-       for (k=0; k<ndig; k++) {
-           digit= (AliMUONDigit*) muonDigits->UncheckedAt(k);
-           if (rec->TestTrack(digit->Track(0)))
-           new(lhits2[n++]) AliMUONDigit(*digit);
-       }
+/// Convert  raw data to SDigit
+/// Only for tracking for the moment (ChF) 
+
+  //fLoader->LoadDigits("READ");
+  if (!fLoader->TreeS()) fLoader->MakeSDigitsContainer();
+
+  fMUONData->MakeBranch("S");
+  fMUONData->SetTreeAddress("S");
+  fDigitMaker->Raw2Digits(rawReader);
+  fMUONData->Fill("S");
+
+  fLoader->WriteSDigits("OVERWRITE");
+  fMUONData->ResetSDigits();
+  fLoader->UnloadSDigits();
+
+  return kTRUE;
 
-       if (rec) {       
-           AliMUONClusterInput::Instance()->SetDigits(ich, dig1, dig2);
-           rec->FindRawClusters();
-       }
-       dig1->Delete();
-       dig2->Delete();
-    } // for ich
-    gAlice->TreeR()->Fill();
-    ResetRawClusters();
-    char hname[30];
-    sprintf(hname,"TreeR%d",nev);
-    gAlice->TreeR()->Write(hname,TObject::kOverwrite);
-    gAlice->TreeR()->Reset();
-    printf("\n End of cluster finding for event %d", nev);
-    
-    delete dig1;
-    delete dig2;
-    //gObjectTable->Print();
 }
+
+//_______________________________________________________________________
+AliLoader* AliMUON::MakeLoader(const char* topfoldername)
+{ 
+/// Build standard getter (AliLoader type);
+/// if detector wants to use castomized getter, it must overload this method
  
-#ifdef never
-void AliMUON::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class AliMUON.
-      AliMUONChamber        *iChamber;
-      AliMUONTriggerCircuit *iTriggerCircuit;
-      AliSegmentation       *segmentation;
-      AliMUONResponse       *response;
-      TClonesArray          *digitsaddress;
-      TClonesArray          *rawcladdress;
-      Int_t i;
-      if (R__b.IsReading()) {
-         Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-         AliDetector::Streamer(R__b);
-         R__b >> fNPadHits;
-         R__b >> fPadHits; // diff
-         R__b >> fNLocalTrigger;       
-         R__b >> fLocalTrigger;       
-         R__b >> fNGlobalTrigger;       
-         R__b >> fGlobalTrigger;   
-         R__b >> fDchambers;
-         R__b >> fRawClusters;
-         R__b.ReadArray(fNdch);
-         R__b.ReadArray(fNrawch);
-         R__b >> fAccCut;
-         R__b >> fAccMin;
-         R__b >> fAccMax; 
-         R__b >> fChambers;
-         R__b >> fTriggerCircuits;
-         for (i =0; i<AliMUONConstants::NTriggerCircuit(); i++) {
-             iTriggerCircuit=(AliMUONTriggerCircuit*) (*fTriggerCircuits)[i];
-             iTriggerCircuit->Streamer(R__b);
-         }
-// Stream chamber related information
-         for (i =0; i<AliMUONConstants::NCh(); i++) {
-             iChamber=(AliMUONChamber*) (*fChambers)[i];
-             iChamber->Streamer(R__b);
-             if (iChamber->Nsec()==1) {
-                 segmentation=iChamber->SegmentationModel(1);
-                 if (segmentation)
-                     segmentation->Streamer(R__b);
-             } else {
-                 segmentation=iChamber->SegmentationModel(1);
-                 if (segmentation)
-                     segmentation->Streamer(R__b);
-                 if (segmentation)
-                     segmentation=iChamber->SegmentationModel(2);
-                 segmentation->Streamer(R__b);
-             }
-             response=iChamber->ResponseModel();
-             if (response)
-                 response->Streamer(R__b);       
-             digitsaddress=(TClonesArray*) (*fDchambers)[i];
-             digitsaddress->Streamer(R__b);
-             if (i < AliMUONConstants::NTrackingCh()) {
-                 rawcladdress=(TClonesArray*) (*fRawClusters)[i];
-                 rawcladdress->Streamer(R__b);
-             }
-         }
-         
-      } else {
-         R__b.WriteVersion(AliMUON::IsA());
-         AliDetector::Streamer(R__b);
-         R__b << fNPadHits;
-         R__b << fPadHits; // diff
-         R__b << fNLocalTrigger;       
-         R__b << fLocalTrigger;       
-         R__b << fNGlobalTrigger;       
-         R__b << fGlobalTrigger; 
-         R__b << fDchambers;
-         R__b << fRawClusters;
-         R__b.WriteArray(fNdch, AliMUONConstants::NCh());
-         R__b.WriteArray(fNrawch, AliMUONConstants::NTrackingCh());
-         
-         R__b << fAccCut;
-         R__b << fAccMin;
-         R__b << fAccMax; 
-         
-         R__b << fChambers;
-         R__b << fTriggerCircuits;
-         for (i =0; i<AliMUONConstants::NTriggerCircuit(); i++) {
-             iTriggerCircuit=(AliMUONTriggerCircuit*) (*fTriggerCircuits)[i];
-             iTriggerCircuit->Streamer(R__b);
-         }
-         for (i =0; i<AliMUONConstants::NCh(); i++) {
-             iChamber=(AliMUONChamber*) (*fChambers)[i];
-             iChamber->Streamer(R__b);
-             if (iChamber->Nsec()==1) {
-                 segmentation=iChamber->SegmentationModel(1);
-                 if (segmentation)
-                     segmentation->Streamer(R__b);
-             } else {
-                 segmentation=iChamber->SegmentationModel(1);
-                 if (segmentation)
-                     segmentation->Streamer(R__b);
-                 segmentation=iChamber->SegmentationModel(2);
-                 if (segmentation)
-                     segmentation->Streamer(R__b);
-             }
-             response=iChamber->ResponseModel();
-             if (response)
-                 response->Streamer(R__b);
-             digitsaddress=(TClonesArray*) (*fDchambers)[i];
-             digitsaddress->Streamer(R__b);
-             if (i < AliMUONConstants::NTrackingCh()) {
-                 rawcladdress=(TClonesArray*) (*fRawClusters)[i];
-                 rawcladdress->Streamer(R__b);
-             }
-         }
-      }
-}
-#endif
+ AliDebug(1,Form("Creating standard getter for detector %s. Top folder is %s.",
+         GetName(),topfoldername));
+ fLoader   = new AliLoader(GetName(),topfoldername);
+ fMUONData = new AliMUONData(fLoader,GetName(),GetName()); 
+ fMUONData->SetSplitLevel(fSplitLevel);
 
-AliMUONPadHit* AliMUON::FirstPad(AliMUONHit*  hit, TClonesArray *clusters) 
-{
-//
-    // Initialise the pad iterator
-    // Return the address of the first padhit for hit
-    TClonesArray *theClusters = clusters;
-    Int_t nclust = theClusters->GetEntriesFast();
-    if (nclust && hit->PHlast() > 0) {
-       AliMUON::fMaxIterPad=hit->PHlast();
-       AliMUON::fCurIterPad=hit->PHfirst();
-       return (AliMUONPadHit*) clusters->UncheckedAt(AliMUON::fCurIterPad-1);
-    } else {
-       return 0;
-    }
-}
+ fDigitMaker->SetMUONData(fMUONData);
 
-AliMUONPadHit* AliMUON::NextPad(TClonesArray *clusters) 
-{
-// Get next pad (in iterator) 
-//
-    AliMUON::fCurIterPad++;
-    if (AliMUON::fCurIterPad <= AliMUON::fMaxIterPad) {
-       return (AliMUONPadHit*) clusters->UncheckedAt(AliMUON::fCurIterPad-1);
-    } else {
-       return 0;
-    }
+ return fLoader;
 }
-
+//_______________________________________________________________________
 
 AliMUONRawCluster *AliMUON::RawCluster(Int_t ichamber, Int_t icathod, Int_t icluster)
 {
-//
-//  Return rawcluster (icluster) for chamber ichamber and cathode icathod
-//  Obsolete ??
-    TClonesArray *muonRawCluster  = RawClustAddress(ichamber);
+/// Return rawcluster (icluster) for chamber ichamber and cathode icathod
+/// Obsolete ??
+
+    TClonesArray *muonRawCluster  = GetMUONData()->RawClusters(ichamber);
     ResetRawClusters();
-    TTree *treeR = gAlice->TreeR();
+    TTree *treeR = fLoader->TreeR();
     Int_t nent=(Int_t)treeR->GetEntries();
     treeR->GetEvent(nent-2+icathod-1);
     //treeR->GetEvent(icathod);
@@ -1649,28 +513,59 @@ AliMUONRawCluster *AliMUON::RawCluster(Int_t ichamber, Int_t icathod, Int_t iclu
     return  mRaw;
 }
 
-AliMUON& AliMUON::operator = (const AliMUON& rhs)
+//________________________________________________________________________
+void
+AliMUON::ResetGeometryBuilder()
 {
-// copy operator
-// dummy version
-    return *this;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+/// Only to be used by "experts" wanting to change the geometry builders
+/// to be used. 
+/// As the ctor of AliMUON now defines a default geometrybuilder, this
+/// ResetGeometryBuilder() must be called prior to call the 
+/// AddGeometryBuilder()
 
+  delete fGeometryBuilder;
+  fGeometryBuilder = new AliMUONGeometryBuilder(this);
+  fGeometryBuilder
+    ->AddBuilder(new AliMUONCommonGeometryBuilder(this));
+}
 
+//____________________________________________________________________
+Bool_t  AliMUON::GetTriggerResponseV1() const
+{
+///
+/// Returns fTriggerResponseV1
+///  
+    return fTriggerResponseV1;
+    
+}  
 
+//____________________________________________________________________
+Int_t  AliMUON::GetTriggerCoinc44() const
+{
+///
+/// Returns fTriggerCoinc44
+///  
+    return fTriggerCoinc44;
+    
+}
 
+//____________________________________________________________________
+Bool_t  AliMUON::GetTriggerEffCells() const
+{
+///
+/// Returns fTriggerEffCells
+///  
+    return fTriggerEffCells;
+    
+}  
 
+//____________________________________________________________________
+Bool_t  AliMUON::GetDigitizerWithNoise() const
+{
+///
+/// Returns fDigitizerWithNoise
+///  
+    return fDigitizerWithNoise;
+    
+}