]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUON.cxx
- Volume name attribute replaced with volume path
[u/mrichter/AliRoot.git] / MUON / AliMUON.cxx
index 679599f21f206403830107d0f39c464ffd3b3bb4..e02164ecfb68e17d21bbc93c5c2babbf5d006603 100644 (file)
 #include <TVector.h>
 #include <TVirtualMC.h>
 
-#include "AliConst.h" 
-#include "AliHeader.h"
-#include "AliHitMap.h"
+//#include "AliHeader.h"
 #include "AliLoader.h"
 #include "AliRunDigitizer.h"
 #include "AliMC.h"
-#include "AliMUONLoader.h"
+#include "AliRun.h"    
 #include "AliMUON.h"
 #include "AliMUONChamberTrigger.h"
-#include "AliMUONClusterFinderAZ.h"
 #include "AliMUONConstants.h"
-#include "AliMUONDigit.h"
-#include "AliMUONGlobalTrigger.h"
-#include "AliMUONHit.h"
-#include "AliMUONHitMapA1.h"
-#include "AliMUONLocalTrigger.h"
-#include "AliMUONMerger.h"     
-#include "AliMUONPadHit.h"
+#include "AliMUONHit.h"        
 #include "AliMUONRawCluster.h"
 #include "AliMUONTransientDigit.h"
 #include "AliMUONTriggerCircuit.h"
-#include "AliMUONTriggerDecision.h"
+#include "AliMUONGeometry.h"
+#include "AliMUONGeometryTransformer.h"
+#include "AliMUONGeometryBuilder.h"
+#include "AliMUONCommonGeometryBuilder.h"
 #include "AliMUONVGeometryBuilder.h"   
-#include "AliRun.h"    
+#include "AliMUONGeometrySegmentation.h"
 #include "AliMUONDigitizerv2.h"
 #include "AliMUONSDigitizerv1.h"
+#include "AliMUONRawWriter.h"
+#include "AliMUONSegmentation.h"
+#include "AliLog.h"
 
+#include "AliMUONSDigitizerV2.h"
+#include "AliMUONDigitizerV3.h"
 
 // Defaults parameters for Z positions of chambers
 // taken from values for "stations" in AliMUON::AliMUON
 //          for the first and second chambers in the station, respectively
 
 ClassImp(AliMUON)
+
 //__________________________________________________________________
 AliMUON::AliMUON()
+  : AliDetector(),
+    fNCh(0),
+    fNTrackingCh(0),
+    fMUONData(0),
+    fSplitLevel(0),
+    fChambers(0),
+    fTriggerCircuits(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),
+    fSDigitizerType(""),
+    fDigitizerType("")
 {
 // Default Constructor
 //
-    fNCh             = 0;
-    fNTrackingCh     = 0;
+       AliDebug(1,Form("default (empty) ctor this=%p",this));
     fIshunt          = 0;
-    fChambers        = 0;
-    fGeometryBuilders = 0; 
-    fTriggerCircuits = 0;
-    fAccMin          = 0.;
-    fAccMax          = 0.;   
-    fAccCut          = kFALSE;
-    fMerger          = 0;
-    fMUONData        = 0;
-    fSplitLevel      = 0;
 }
-//__________________________________________________________________
-AliMUON::AliMUON(const char *name, const char *title)
-  : AliDetector(name,title)
-{
-//Begin_Html
-/*
-<img src="gif/alimuon.gif">
-*/
-//End_Html
-  fMUONData  = 0x0;
-  fSplitLevel= 0;
-  fIshunt     =  0;
 
-  fNCh             = AliMUONConstants::NCh(); 
-  fNTrackingCh     = AliMUONConstants::NTrackingCh();
+//__________________________________________________________________
+AliMUON::AliMUON(const char *name, const char *title,
+                 const char* sDigitizerClassName,
+                 const char* digitizerClassName)
+  : AliDetector(name,title),
+    fNCh(AliMUONConstants::NCh()),
+    fNTrackingCh(AliMUONConstants::NTrackingCh()),
+    fMUONData(0),
+    fSplitLevel(0),
+    fChambers(0),
+    fTriggerCircuits(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),
+    fSDigitizerType(sDigitizerClassName),
+    fDigitizerType(digitizerClassName)
+{
+       AliDebug(1,Form("ctor this=%p",this));
+  fIshunt =  0;
 
   SetMarkerColor(kRed);//
+    
+  // Geometry builder
+  fGeometryBuilder = new AliMUONGeometryBuilder(this);
+  
+  // Common geometry definitions
+  fGeometryBuilder
+    ->AddBuilder(new AliMUONCommonGeometryBuilder(this));
+
 //
 // Creating List of Chambers
     Int_t ch;
     fChambers = new TObjArray(AliMUONConstants::NCh());
-    fGeometryBuilders = new TObjArray(AliMUONConstants::NCh());
 
     // Loop over stations
     for (Int_t st = 0; st < AliMUONConstants::NCh() / 2; st++) {
@@ -140,60 +172,34 @@ AliMUON::AliMUON(const char *name, const char *title)
        if (ch < AliMUONConstants::NTrackingCh()) {
          fChambers->AddAt(new AliMUONChamber(ch),ch);
        } else {
-         fChambers->AddAt(new AliMUONChamberTrigger(ch),ch);
+         fChambers->AddAt(new AliMUONChamberTrigger(ch, GetGeometryTransformer()),ch);
        }
-       AliMUONChamber* chamber = (AliMUONChamber*) fChambers->At(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 
     }     // Station st (0...)
     
-    // Negatives values are ignored by geant3 CONS200 in the calculation of the tracking parameters
-    fMaxStepGas=0.1; 
-    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->AddAt(new AliMUONTriggerCircuit(),circ);          
     }
-    fMerger = 0;
 }
+
 //____________________________________________________________________
-AliMUON::AliMUON(const AliMUON& rMUON):AliDetector(rMUON)
+AliMUON::AliMUON(const AliMUON& rMUON)
+ : AliDetector(rMUON)
 {
-// Dummy copy constructor
-    ;
-    
+// Protected copy constructor
+
+  AliFatal("Not implemented.");
 }
+
 //____________________________________________________________________
 AliMUON::~AliMUON()
 {
 // Destructor
-  if(fDebug) printf("%s: Calling AliMUON destructor !!!\n",ClassName());
+  AliDebug(1,Form("dtor this=%p",this));
   fIshunt  = 0;
-  if (fMerger) delete fMerger;
 
-  if (fGeometryBuilders){
-    fGeometryBuilders->Delete();
-    delete fGeometryBuilders;
-  }
   if (fChambers){
     fChambers->Delete();
     delete fChambers;
@@ -203,31 +209,68 @@ AliMUON::~AliMUON()
     delete fTriggerCircuits;
   }
   delete fMUONData;
+  delete fGeometryBuilder;
+  delete fSegmentation;
 }
+
+//________________________________________________________________________
+AliMUON& AliMUON::operator = (const AliMUON& rhs)
+{
+// Protected assignement operator
+
+  if (this == &rhs) return *this;
+
+  AliFatal("Not implemented.");
+    
+  return *this;  
+}
+
 //_____________________________________________________________________________
 void AliMUON::AddGeometryBuilder(AliMUONVGeometryBuilder* geomBuilder)
 {
 // Adds the geometry builder to the list
 // ---
 
-  fGeometryBuilders->Add(geomBuilder);
+  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");
-    }
-  }
+
+
+//     for (Int_t i = 0; i < AliMUONConstants::NCh(); i++)     
+//       this->Chamber(i).SegmentationModel2(1)->Draw("eventdisplay");// to be check !
+     
+  
 }
-//___________________________________________________________________
-Int_t AliMUON::DistancetoPrimitive(Int_t , Int_t )
+
+//____________________________________________________________________
+const AliMUONGeometry*  AliMUON::GetGeometry() const
 {
-  return 9999;
-}
+// Return geometry parametrisation
+
+  if ( !fGeometryBuilder) {
+    AliWarningStream() << "GeometryBuilder not defined." << std::endl;
+    return 0;
+  }
+  
+  return fGeometryBuilder->GetGeometry();
+}   
+
+//____________________________________________________________________
+const AliMUONGeometryTransformer*  AliMUON::GetGeometryTransformer() const
+{
+// Return geometry parametrisation
+
+  const AliMUONGeometry* kGeometry = GetGeometry();
+  
+  if ( !kGeometry) return 0;
+
+  return kGeometry->GetTransformer();
+}   
+
 //__________________________________________________________________
 void  AliMUON::SetTreeAddress()
 {
@@ -245,32 +288,6 @@ void  AliMUON::SetTreeAddress()
   fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector    
 }
 
-//____________________________________________________________________
-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->At(i))  ->SetPadSize(isec,p1,p2);
-    ((AliMUONChamber*) fChambers->At(i+1))->SetPadSize(isec,p1,p2);
-}
-
-//___________________________________________
-void AliMUON::SetChambersZ(const Float_t *Z)
-{
-  // 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->At(ch))->SetZ(Z[ch]);
-    return;
-}
-//_________________________________________________________________
-void AliMUON::SetChambersZToDefault()
-{
-  // Set Z values for all chambers (tracking and trigger)
-  // to default values
-  SetChambersZ(AliMUONConstants::DefaultChamberZ());
-  return;
-}
 //_________________________________________________________________
 void AliMUON::SetChargeSlope(Int_t id, Float_t p1)
 {
@@ -305,6 +322,7 @@ void AliMUON::SetMaxAdc(Int_t id, Int_t p1)
     ((AliMUONChamber*) fChambers->At(i))->SetMaxAdc(p1);
     ((AliMUONChamber*) fChambers->At(i+1))->SetMaxAdc(p1);
 }
+
 //__________________________________________________________________
 void AliMUON::SetMaxStepGas(Float_t p1)
 {
@@ -329,26 +347,6 @@ 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(TMath::Abs(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMin)));
-       Chamber(ch).SetROuter(TMath::Abs(AliMUONConstants::DefaultChamberZ(ch)*TMath::Tan(fAccMax)));
-      } // chamber loop
-    } // station loop
-  }
-}
 
 //____________________________________________________________________
 Float_t  AliMUON::GetMaxStepGas() const
@@ -381,13 +379,23 @@ Float_t  AliMUON::GetMaxDestepAlu() const
   
   return fMaxDestepAlu;
 }
+
 //____________________________________________________________________
-void   AliMUON::SetSegmentationModel(Int_t id, Int_t isec, AliSegmentation *segmentation)
+ void  AliMUON::SetAlign(Bool_t align)
 {
-// Set the segmentation for chamber id cathode isec
-    ((AliMUONChamber*) fChambers->At(id))->SetSegmentationModel(isec, segmentation);
+ // Sets option for alignement to geometry builder
+   fGeometryBuilder->SetAlign(align);
+}   
+
+//____________________________________________________________________
+ void  AliMUON::SetAlign(const TString& fileName, Bool_t align)
+{
+ // Sets option for alignement to geometry builder
+   fGeometryBuilder->SetAlign(fileName, align);
+}   
 
-}
 //____________________________________________________________________
 void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
 {
@@ -395,31 +403,45 @@ void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
     ((AliMUONChamber*) fChambers->At(id))->SetResponseModel(response);
 }
 //____________________________________________________________________
-void   AliMUON::SetNsec(Int_t id, Int_t nsec)
+AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
 {
-// Set number of segmented cathods for chamber id
-    ((AliMUONChamber*) fChambers->At(id))->SetNsec(nsec);
+  // FIXME: the selection of the class should be done through a factory
+  // mechanism. (see also Hits2SDigits()).
+  
+  AliInfo(Form("Digitizer used : %s",fDigitizerType.Data()));
+  
+  if ( fDigitizerType == "digitizer:default" )
+  {
+    return new AliMUONDigitizerv2(manager);
+  }
+  else if ( fDigitizerType == "digitizer:NewDigitizerNewTrigger" ) 
+  {
+    return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerElectronics);
+  }
+  else if ( fDigitizerType == "digitizer:NewDigitizerOldTrigger" )
+  {
+    return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision);
+  }
+  else
+  {
+    AliFatal(Form("Unknown digitizer type : %s",fDigitizerType.Data()));
+  }
+  return 0x0;
 }
-//____________________________________________________________________
-AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
+
+//_____________________________________________________________________
+TString
+AliMUON::SDigitizerType() const
 {
-  return new AliMUONDigitizerv2(manager);
+  return fSDigitizerType;
 }
+
 //_____________________________________________________________________
 void AliMUON::SDigits2Digits()
 {
 
 // write TreeD here 
 
-    if (!fMerger) {
-      if (gAlice->GetDebug()>0) {
-       cerr<<"AliMUON::SDigits2Digits: create default AliMUONMerger "<<endl;
-       cerr<<" no merging, just digitization of 1 event will be done"<<endl;
-      }
-      fMerger = new AliMUONMerger();
-    }
-    fMerger->Init();
-    fMerger->Digitise();
     char hname[30];
     //    sprintf(hname,"TreeD%d",fLoader->GetHeader()->GetEvent());
     fLoader->TreeD()->Write(hname,TObject::kOverwrite);
@@ -429,176 +451,67 @@ void AliMUON::SDigits2Digits()
 //_____________________________________________________________________
 void AliMUON::Hits2SDigits()
 {
-  // Adaption of AliMUONSDigitizerv1 to be excuted by the AliSimulation framework
-  AliRunLoader* runLoader = fLoader->GetRunLoader();
-  AliRunDigitizer   * manager = new AliRunDigitizer(1,1);
-  manager->SetInputStream(0,runLoader->GetFileName(),AliConfig::GetDefaultEventFolderName());
-  AliMUONDigitizer * dMUON   = new AliMUONSDigitizerv1(manager);
-  fLoader->LoadHits("READ");
-  for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) {
-    runLoader->GetEvent(iEvent);
-    dMUON->Exec("");
+  // FIXME: the selection of the sdigitizer should be done through a
+  // factory mechanism.
+  
+  AliInfo(Form("SDigitizer used : %s",fSDigitizerType.Data()));
+
+  if ( fSDigitizerType == "sdigitizer:default" )
+  {
+    // Adaption of AliMUONSDigitizerv1 to be excuted by the AliSimulation framework
+    AliRunLoader* runLoader = fLoader->GetRunLoader();
+    AliRunDigitizer   * manager = new AliRunDigitizer(1,1);
+    manager->SetInputStream(0,runLoader->GetFileName(),AliConfig::GetDefaultEventFolderName());
+    AliMUONDigitizer * dMUON   = new AliMUONSDigitizerv1(manager);
+    fLoader->LoadHits("READ");
+    for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) {
+      runLoader->GetEvent(iEvent);
+      dMUON->Exec("");
+    }
+    fLoader->UnloadHits();
+  }
+  else if ( fSDigitizerType == "sdigitizer:AliMUONSDigitizerV2" )
+  {
+    TTask* sdigitizer = new AliMUONSDigitizerV2;
+    sdigitizer->ExecuteTask();
+  }
+  else
+  {
+    AliFatal(Form("Unknown sdigitizer classname : %s",fSDigitizerType.Data()));
   }
-  fLoader->UnloadHits();
 }
+
+//_____________________________________________________________________
+TString
+AliMUON::DigitizerType() const
+{
+  return fDigitizerType;
+}
+
+//_____________________________________________________________________
+void AliMUON::Digits2Raw()
+{
+  // convert digits of the current event to raw data
+  AliMUONRawWriter rawData(fLoader,fMUONData);
+
+  if (fTriggerScalerEvent == kTRUE) rawData.SetScalerEvent();
+  if (!rawData.Digits2Raw()) AliInfo("pb writting raw data");
+}
+
 //_______________________________________________________________________
 AliLoader* AliMUON::MakeLoader(const char* topfoldername)
 { 
 //builds standard getter (AliLoader type)
 //if detector wants to use castomized getter, it must overload this method
 
- if (GetDebug())
-   Info("MakeLoader",
-        "Creating standard getter for detector %s. Top folder is %s.",
-         GetName(),topfoldername);
+ 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);
  return fLoader;
 }
-
-//______________________________________________________________________
-#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
-//_______________________________________________________________________
-AliMUONPadHit* AliMUON::FirstPad(AliMUONHit*  hit, TClonesArray *clusters) 
-{
-// to be removed
-    // 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;
-    }
-}
-//_______________________________________________________________________
-AliMUONPadHit* AliMUON::NextPad(TClonesArray *clusters) 
-{
-  // To be removed
-// Get next pad (in iterator) 
-//
-    AliMUON::fCurIterPad++;
-    if (AliMUON::fCurIterPad <= AliMUON::fMaxIterPad) {
-       return (AliMUONPadHit*) clusters->UncheckedAt(AliMUON::fCurIterPad-1);
-    } else {
-       return 0;
-    }
-}
 //_______________________________________________________________________
 
 AliMUONRawCluster *AliMUON::RawCluster(Int_t ichamber, Int_t icathod, Int_t icluster)
@@ -620,21 +533,4 @@ AliMUONRawCluster *AliMUON::RawCluster(Int_t ichamber, Int_t icathod, Int_t iclu
     return  mRaw;
 }
 //________________________________________________________________________
-void   AliMUON::SetMerger(AliMUONMerger* merger)
-{
-// Set pointer to merger 
-    fMerger = merger;
-}
-//________________________________________________________________________
-AliMUONMerger*  AliMUON::Merger()
-{
-// Return pointer to merger
-    return fMerger;
-}
-//________________________________________________________________________
-AliMUON& AliMUON::operator = (const AliMUON& /*rhs*/)
-{
-// copy operator
-// dummy version
-    return *this;
-}
+