Remove obselete members & methods (Ch. Finck)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 92e7cb6a0b566bc75b619e2ec262a07fdfd97690..3b8f8d4d118de40a22b75d7a82bda7876f7ca564 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -94,7 +94,6 @@ AliMUON::AliMUON()
     fChambers(0),
     fTriggerCircuits(0),
     fGeometryBuilder(0),
-    fSegmentationType(2),// set to 2 default wise new seg
     fDEIndexing(0),
     fAccCut(kFALSE),
     fAccMin(0.),
@@ -122,7 +121,6 @@ AliMUON::AliMUON(const char *name, const char *title)
     fChambers(0),
     fTriggerCircuits(0),
     fGeometryBuilder(0),
-    fSegmentationType(2),// set to 2 default wise new seg
     fDEIndexing(0),
     fAccCut(kFALSE),
     fAccMin(0.),
@@ -252,11 +250,6 @@ void AliMUON::BuildGeometry()
 {
 // Geometry for event display
 
-  if (!fSegmentationType) {
-    AliFatal("No Segmentation Type defined.");
-    return;
-  }
-
 
 //     for (Int_t i = 0; i < AliMUONConstants::NCh(); i++)     
 //       this->Chamber(i).SegmentationModel2(1)->Draw("eventdisplay");// to be check !

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 8703ec882e46eeda556458c3fca5be2d7d2c33c7..1091e5ed6d94430a7742cfe1d1bf244174add7a5 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -81,9 +81,6 @@ class AliMUON : public  AliDetector
     virtual void   SetSegmentationModel(Int_t id, Int_t isec,
                                        AliMUONGeometrySegmentation* segmentation);
 
-    void SetSegmentationType(Int_t type) {fSegmentationType = type;}// 1 for old 2 for new, 0 undefined
-    Int_t WhichSegmentation() {return fSegmentationType; }
-
     virtual void   SetResponseModel(Int_t id, AliMUONResponse *response);
     virtual void   SetNsec(Int_t id, Int_t nsec);
 
@@ -126,7 +123,6 @@ class AliMUON : public  AliDetector
     TObjArray*            fChambers;           // List of Tracking Chambers
     TObjArray*            fTriggerCircuits;    // List of Trigger Circuits
     AliMUONGeometryBuilder*     fGeometryBuilder; // Geometry builder 
-    Int_t                 fSegmentationType;    // type for  segmentation
     AliMUONGeometryDEIndexing*  fDEIndexing;   // Geometry DE indexing 
    
     //

diff --git a/MUON/AliMUONClusterFinderVS.cxx b/MUON/AliMUONClusterFinderVS.cxx
index f122500d70954d4bb4d37244737a56bd1adaf6bf..8a1e7f10b8f929c1c92cb12f3fecc90aafbacb75 100644 (file)
--- a/MUON/AliMUONClusterFinderVS.cxx
+++ b/MUON/AliMUONClusterFinderVS.cxx
@@ -43,7 +43,6 @@ AliMUONClusterFinderVS::AliMUONClusterFinderVS()
 {
 // Default constructor
     fInput=AliMUONClusterInput::Instance();
-//     cout <<  " TYPE" << fSegmentationType << endl;
     fHitMap[0] = 0;
     fHitMap[1] = 0;
     fTrack[0]=fTrack[1]=-1;
@@ -1437,9 +1436,6 @@ void AliMUONClusterFinderVS::FindRawClusters()
 //  Return if no input datad available
     if (!fInput->NDigits(0) && !fInput->NDigits(1)) return;
 
-    if(fInput->GetSegmentationType() == 1)
-      AliFatal("Old Segmentation no more supported.");
-
     fSeg2[0] = fInput->Segmentation2(0);
     fSeg2[1] = fInput->Segmentation2(1);
     

diff --git a/MUON/AliMUONClusterFinderVS.h b/MUON/AliMUONClusterFinderVS.h
index 1a0e1419cc5d9885a21080ac265a5299f7cab335..7e72fa8680cfc58b5c6c3ffb43e72be0a324dcb4 100644 (file)
--- a/MUON/AliMUONClusterFinderVS.h
+++ b/MUON/AliMUONClusterFinderVS.h
@@ -16,7 +16,6 @@ class TClonesArray;
 
 class AliMUONClusterInput;
 class AliMUONHitMapA1;
-class AliSegmentation;
 class AliMUONGeometrySegmentation;
 class AliMUONRawCluster;
 class AliMUONDigit;

diff --git a/MUON/AliMUONClusterInput.cxx b/MUON/AliMUONClusterInput.cxx
index 573b1ba0a882c796ee2ba73ab0a0351a9eb7b547..9b29c342a03972282fe97f2ccbf71378b93ee6f6 100644 (file)
--- a/MUON/AliMUONClusterInput.cxx
+++ b/MUON/AliMUONClusterInput.cxx
@@ -38,7 +38,6 @@ AliMUONClusterInput::AliMUONClusterInput()
   : TObject(),
     fCluster(0),
     fChargeCorrel(1.),
-    fSegmentationType(2),
     fDetElemId(0)
   
 {
@@ -90,8 +89,6 @@ void AliMUONClusterInput::SetDigits(Int_t chamber, Int_t idDE, TClonesArray* dig
     iChamber =  &(pMUON->Chamber(chamber));
 
     fgMathieson = new AliMUONMathieson();
-    if ((fSegmentationType = pMUON->WhichSegmentation()) != 2)
-      AliFatal("Wrong segmentation type");
 
     fSegmentation2[0]=iChamber->SegmentationModel2(1);
     fSegmentation2[1]=iChamber->SegmentationModel2(2);
@@ -125,8 +122,6 @@ void AliMUONClusterInput::SetDigits(Int_t chamber, Int_t idDE, TClonesArray* dig
 
     pMUON = (AliMUON*) gAlice->GetModule("MUON");
     iChamber =  &(pMUON->Chamber(chamber));
-    if ((fSegmentationType = pMUON->WhichSegmentation()) != 2)
-      AliFatal("Wrong segmentation type");
     
     fSegmentation2[0]=iChamber->SegmentationModel2(1);
 

diff --git a/MUON/AliMUONClusterInput.h b/MUON/AliMUONClusterInput.h
index bff42faba3eaf5486feef85c4f136b1485ad94ed..97d443cb318f211e7e7b725fa8b5c0c8a574f044 100644 (file)
--- a/MUON/AliMUONClusterInput.h
+++ b/MUON/AliMUONClusterInput.h
@@ -14,7 +14,6 @@ class TMinuit;
 
 class AliMUONDigit;
 class AliMUONRawCluster;
-class AliSegmentation;
 class AliMUONMathieson;
 
 class AliMUONClusterInput : public TObject 
@@ -36,7 +35,6 @@ class AliMUONClusterInput : public TObject
     AliMUONMathieson* Mathieson() const {return fgMathieson;}    
     Float_t ChargeCorrel() const {return fChargeCorrel;}    
     Int_t DetElemId() const {return fDetElemId;}
-    Int_t GetSegmentationType() const {return fSegmentationType;}
 
 // Fitting    
     TMinuit*      Fitter() const {return fgMinuit;}
@@ -79,7 +77,6 @@ class AliMUONClusterInput : public TObject
     Float_t              fQtot[2];         // ! Total charge
     Float_t              fZ;               // ! Current z-position
     Float_t              fChargeCorrel;    // ! charge correlation 
-    Int_t                fSegmentationType;// ! Segmentation type old or new
     Int_t                fDetElemId;       // ! detection elt id    
 
     // Fitter

diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx
index e6c3e014e2d1b3582c7d699c2b05d3b33129051d..4de7cb2e1fdc5d95fdcb21f870ba5a01fcb5876e 100644 (file)
--- a/MUON/AliMUONDigitizer.cxx
+++ b/MUON/AliMUONDigitizer.cxx
@@ -119,16 +119,6 @@ AliMUONDigitizer::operator=(const AliMUONDigitizer& rhs)
     
   return *this;  
 }    
-
-//------------------------------------------------------------------------
-void AliMUONDigitizer::CheckSegmentation()
-{
-  if (fMUON->WhichSegmentation()==1) {
-      AliFatal("Old Segmentation no more supported.");
-      return;
-  }
-
-}
          
 //------------------------------------------------------------------------
 Bool_t AliMUONDigitizer::Init()
@@ -518,7 +508,6 @@ void AliMUONDigitizer::InitArrays()
     //  two HitMaps per chamber, or one HitMap per cahtode plane
     fHitMap = new AliMUONHitMapA1* [2*AliMUONConstants::NDetElem()];
     for (Int_t i=0; i<2*AliMUONConstants::NDetElem(); i++) fHitMap[i] = 0x0;
-    CheckSegmentation(); // check it one for all
 
     Int_t k = 0;
     Int_t idDE;

diff --git a/MUON/AliMUONDigitizer.h b/MUON/AliMUONDigitizer.h
index 6825abd1fe070c174cf9544d2ae9afbaf5b93cb7..06674484a492a313903270a02d9074e56de7fa37 100644 (file)
--- a/MUON/AliMUONDigitizer.h
+++ b/MUON/AliMUONDigitizer.h
@@ -173,9 +173,7 @@ protected:
        virtual void AddDigitTrigger(
                        Int_t chamber, Int_t tracks[kMAXTRACKS],
                        Int_t charges[kMAXTRACKS], Int_t digits[6],
-                       Int_t digitindex
-               ) = 0;
-       virtual void CheckSegmentation();
+                       Int_t digitindex ) = 0;
 
        AliRunLoader* fRunLoader;         //! Global run loader.
        AliMUONLoader* fGime;             //! MUON specific loader.

diff --git a/MUON/AliMUONEventReconstructor.cxx b/MUON/AliMUONEventReconstructor.cxx
index 96a00f5d6196f0445904daa43a15136dbfc10f88..b94f13ffda69fce51ec0878959e38d42ae1217b3 100644 (file)
--- a/MUON/AliMUONEventReconstructor.cxx
+++ b/MUON/AliMUONEventReconstructor.cxx
@@ -1050,10 +1050,9 @@ Bool_t AliMUONEventReconstructor::MakeTriggerTracks(void)
       Float_t thetax = TMath::ATan2( x11 , z11 );
       Float_t thetay = TMath::ATan2( (y21-y11) , (z21-z11) );
 
-      recTriggerTrack = new AliMUONTriggerTrack(x11,y11,thetax,thetay,gloTrigPat,this);
+      recTriggerTrack = new AliMUONTriggerTrack(x11,y11,thetax,thetay,gloTrigPat);
       // since static statement does not work, set gloTrigPat for each track
 
-      //       fNRecTriggerTracks++;
       fMUONData->AddRecTriggerTrack(*recTriggerTrack);
     } // end of loop on Local Trigger
     return kTRUE;    

diff --git a/MUON/AliMUONMathieson.cxx b/MUON/AliMUONMathieson.cxx
index 3e4a5726489e14c33c37cb168b76b0308a19d390..47127b511a990434c80e2955fb91f5993c611642 100644 (file)
--- a/MUON/AliMUONMathieson.cxx
+++ b/MUON/AliMUONMathieson.cxx
@@ -19,7 +19,6 @@
 #include <TRandom.h>
 
 #include "AliMUONMathieson.h"
-#include "AliSegmentation.h"
 #include "AliMUONGeometrySegmentation.h"
 
 
@@ -64,33 +63,7 @@ void AliMUONMathieson::SetSqrtKy3AndDeriveKy2Ky4(Float_t SqrtKy3)
   Float_t cy1 = fKy2 * fSqrtKy3 / 4. / TMath::ATan(Double_t(fSqrtKy3));
   fKy4 = cy1 / fKy2 / fSqrtKy3;
 }
-// -------------------------------------------
-Float_t AliMUONMathieson::IntXY(AliSegmentation * segmentation)
-{
-// Calculate charge on current pad according to Mathieson distribution
-// 
-    const Float_t kInversePitch = 1/fPitch;      
-//
-//  Integration limits defined by segmentation model
-//  
-    Float_t xi1, xi2, yi1, yi2;
-    segmentation->IntegrationLimits(xi1,xi2,yi1,yi2);
-    xi1=xi1*kInversePitch;
-    xi2=xi2*kInversePitch;
-    yi1=yi1*kInversePitch;
-    yi2=yi2*kInversePitch;
-//
-// The Mathieson function 
-    Double_t ux1=fSqrtKx3*TMath::TanH(fKx2*xi1);
-    Double_t ux2=fSqrtKx3*TMath::TanH(fKx2*xi2);
 
-    Double_t uy1=fSqrtKy3*TMath::TanH(fKy2*yi1);
-    Double_t uy2=fSqrtKy3*TMath::TanH(fKy2*yi2);
-
-    
-    return Float_t(4.*fKx4*(TMath::ATan(ux2)-TMath::ATan(ux1))*
-                     fKy4*(TMath::ATan(uy2)-TMath::ATan(uy1)));
-}
 // -------------------------------------------
 Float_t AliMUONMathieson::IntXY(Int_t idDE, AliMUONGeometrySegmentation* segmentation)
 {

diff --git a/MUON/AliMUONMathieson.h b/MUON/AliMUONMathieson.h
index 1bc76e01c7bb8cfed1b1f1a62c5f1dca8833209d..ef8d4d51948163d263f28a6e865886b9fc44620f 100644 (file)
--- a/MUON/AliMUONMathieson.h
+++ b/MUON/AliMUONMathieson.h
@@ -6,7 +6,6 @@
 /* $Id$ */
 // Revision of includes 07/05/2004
 
-class AliSegmentation;
 class AliMUONGeometrySegmentation;
 
 class AliMUONMathieson 
@@ -38,7 +37,6 @@ class AliMUONMathieson
     // Mathieson Ky4
     void    SetKy4(Float_t p1) {fKy4 = p1;};
     // Charge disintegration
-    Float_t  IntXY(AliSegmentation * segmentation);
     Float_t  IntXY(Int_t id, AliMUONGeometrySegmentation* segmentation);
 
     ClassDef(AliMUONMathieson,1) // Implementation of Mathieson response

diff --git a/MUON/AliMUONResponse.h b/MUON/AliMUONResponse.h
index c50a0ccf03da349deb32d521cedcc2e9db10473f..30c7ae5c997a50734442e247a85b5bb483fc9993 100644 (file)
--- a/MUON/AliMUONResponse.h
+++ b/MUON/AliMUONResponse.h
@@ -9,7 +9,6 @@
 #include <TObject.h>
 
 class TF1;
-class AliSegmentation;
 class AliMUONGeometrySegmentation;
 class AliMUONTransientDigit;
 
@@ -61,7 +60,6 @@ class AliMUONResponse : public TObject
     // Pulse height from scored quantity (eloss)
     virtual Float_t IntPH(Float_t)                            {return 1.;}
     // Charge disintegration 
-    virtual Float_t IntXY(AliSegmentation *)                  {return 1.;}
     virtual Float_t IntXY(Int_t, AliMUONGeometrySegmentation*) {return 1.;}
 
     // Noise, zero-suppression, adc saturation

diff --git a/MUON/AliMUONResponseTrigger.cxx b/MUON/AliMUONResponseTrigger.cxx
index b4931f46b4bd8b958d119e732236932a702edd9c..352fd4023f51de79f88f688734ea46aac9ef2159 100644 (file)
--- a/MUON/AliMUONResponseTrigger.cxx
+++ b/MUON/AliMUONResponseTrigger.cxx
@@ -15,12 +15,8 @@
 
 /* $Id$ */
 
-//#include <TMath.h>
-//#include <TRandom.h>
-//#include <Riostream.h> 
 
 #include "AliMUONResponseTrigger.h"
-//#include "AliSegmentation.h"
 
 ClassImp(AliMUONResponseTrigger)
 

diff --git a/MUON/AliMUONResponseTriggerV1.cxx b/MUON/AliMUONResponseTriggerV1.cxx
index 96e40bbc45685243b9dfaa765e9f3043fa92504f..5fe76964f2b72dec8f0d6f4afd751fe36a748b2a 100644 (file)
--- a/MUON/AliMUONResponseTriggerV1.cxx
+++ b/MUON/AliMUONResponseTriggerV1.cxx
@@ -19,7 +19,6 @@
 #include <TRandom.h>
 
 #include "AliMUONResponseTriggerV1.h"
-#include "AliSegmentation.h"
 #include "AliMUONGeometrySegmentation.h"
 
 ClassImp(AliMUONResponseTriggerV1)
@@ -57,21 +56,6 @@ Int_t AliMUONResponseTriggerV1::SetGenerCluster(){
   return 1;
 } 
 
-//------------------------------------------------------------------   
-Float_t AliMUONResponseTriggerV1::IntXY(AliSegmentation * segmentation){
-// Returns 1 or 0 if the current strip is fired or not 
-// get the "parameters" needed to evaluate the strip response
-// x1 : hit x(y) position
-// x2 : x(y) coordinate of the main strip
-// x3 : current strip real x(y) coordinate  
-// x4 : dist. between x(y) hit pos. and the closest border of the current strip
-
-  Float_t x1,x2,x3,x4;  
-  segmentation->IntegrationLimits(x1,x2,x3,x4);    
-  Float_t theta = 0.; // incident angle to be implemented
-
-  return (fGenerCluster < FireStripProb(x4,theta)) ? 1:0; 
-}
 //------------------------------------------------------------------   
 Float_t AliMUONResponseTriggerV1::IntXY(Int_t idDE, AliMUONGeometrySegmentation * segmentation){
 // Returns 1 or 0 if the current strip is fired or not 

diff --git a/MUON/AliMUONResponseTriggerV1.h b/MUON/AliMUONResponseTriggerV1.h
index 7cdae7328d066b16136f3b4fedc67e7010d72ddc..f1a1b1c783f6834bc428682e49419b1c6d0c57f6 100644 (file)
--- a/MUON/AliMUONResponseTriggerV1.h
+++ b/MUON/AliMUONResponseTriggerV1.h
@@ -16,7 +16,6 @@ class AliMUONResponseTriggerV1 : public AliMUONResponseTrigger
     AliMUONResponseTriggerV1(Float_t hv);
     virtual ~AliMUONResponseTriggerV1(){} 
     // Charge disintegration
-    virtual Float_t  IntXY(AliSegmentation * segmentation);
     virtual Float_t  IntXY(Int_t idDE, AliMUONGeometrySegmentation * segmentation);
 
     // Set the GenerCluster parameter       

diff --git a/MUON/AliMUONResponseV0.cxx b/MUON/AliMUONResponseV0.cxx
index 438f4d6d5a7a9fd384a4f563c68640942beae2c5..95d452cdfe0eefad6e383b175fa1b70c5d4b7ece 100644 (file)
--- a/MUON/AliMUONResponseV0.cxx
+++ b/MUON/AliMUONResponseV0.cxx
@@ -19,7 +19,6 @@
 #include <TRandom.h>
 
 #include "AliMUONResponseV0.h"
-#include "AliSegmentation.h"
 #include "AliMUONGeometrySegmentation.h"
 
 ClassImp(AliMUONResponseV0)
@@ -72,14 +71,7 @@ Float_t AliMUONResponseV0::IntPH(Float_t eloss)
   }
   return charge;
 }
-  //-------------------------------------------
-Float_t AliMUONResponseV0::IntXY(AliSegmentation * segmentation)
-{
-  // Calculate charge on current pad according to Mathieson distribution
 
-  return fMathieson->IntXY(segmentation);
-
-}
   //-------------------------------------------
 Float_t AliMUONResponseV0::IntXY(Int_t idDE, AliMUONGeometrySegmentation* segmentation)
 {

diff --git a/MUON/AliMUONResponseV0.h b/MUON/AliMUONResponseV0.h
index efd2ce9b418605d54d37425b37ffb7051121ff7b..94f3fe52a818f35c86d365ea2bb0b5b46853f274 100644 (file)
--- a/MUON/AliMUONResponseV0.h
+++ b/MUON/AliMUONResponseV0.h
@@ -79,7 +79,6 @@ class AliMUONResponseV0 : public AliMUONResponse
     // Pulse height from scored quantity (eloss)
     virtual Float_t  IntPH(Float_t eloss);
     // Charge disintegration
-    virtual Float_t  IntXY(AliSegmentation * segmentation);
     virtual Float_t  IntXY(Int_t idDE, AliMUONGeometrySegmentation* segmentation);
     // Noise, zero-suppression, adc saturation
     virtual Int_t DigitResponse(Int_t digit, AliMUONTransientDigit* where);
@@ -97,13 +96,6 @@ class AliMUONResponseV0 : public AliMUONResponse
                                        // is RMS of ln(q1/q2)
     AliMUONMathieson* fMathieson;      // pointer to mathieson fct
 
-/*     Float_t fSqrtKx3;                  // Mathieson Sqrt(Kx3) */
-/*     Float_t fKx2;                      // Mathieson Kx2 */
-/*     Float_t fKx4;                      // Mathieson Kx4 = Kx1/Kx2/Sqrt(Kx3)   */
-/*     Float_t fSqrtKy3;                  // Mathieson Sqrt(Ky3) */
-/*     Float_t fKy2;                      // Mathieson Ky2 */
-/*     Float_t fKy4;                      // Mathieson Ky4 = Ky1/Ky2/Sqrt(Ky3) */
-/*     Float_t fPitch;                    // anode-cathode pitch */
 };
 #endif
 

diff --git a/MUON/AliMUONTriggerCircuit.cxx b/MUON/AliMUONTriggerCircuit.cxx
index 1dd652efadcc85d16d1d6932c6c3b9c0aa3099b1..e888cf6bdf8852da1f72f69534a6e13bfc176d2e 100644 (file)
--- a/MUON/AliMUONTriggerCircuit.cxx
+++ b/MUON/AliMUONTriggerCircuit.cxx
@@ -34,7 +34,6 @@ AliMUONTriggerCircuit::AliMUONTriggerCircuit()
     fIdCircuit(0),
     fX2m(0),
     fX2ud(0)
-    //    fSegmentationType(1)
 {
 // Constructor
 
@@ -77,15 +76,11 @@ AliMUONTriggerCircuit::operator=(const AliMUONTriggerCircuit& rhs)
 void AliMUONTriggerCircuit::Init(Int_t iCircuit) {
 // initialize circuit characteristics
   fIdCircuit=AliMUONTriggerConstants::CircuitId(iCircuit);
-  AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");  
 
   LoadX2();
   LoadXCode();
   LoadYCode();
 
-  if (pMUON->WhichSegmentation() == 1) 
-      AliFatal("Old Segmentation no more supported.");
-
   LoadXPos2();
   LoadYPos2();
   

diff --git a/MUON/AliMUONTriggerCircuit.h b/MUON/AliMUONTriggerCircuit.h
index 905b7b85f4441c31673466a83dd1693d498c5652..cbf2f34c5bfdd57d95b7d2c89130e4e899fed72b 100644 (file)
--- a/MUON/AliMUONTriggerCircuit.h
+++ b/MUON/AliMUONTriggerCircuit.h
@@ -9,7 +9,6 @@
 #include <TObject.h>
 #include <TObjArray.h>
 
-class AliSegmentation;
 class AliMUONGeometrtSegmentation;
 
 class TObjArray;
@@ -75,7 +74,6 @@ class AliMUONTriggerCircuit : public TObject
   Float_t fXpos11[16];         // X position of Y strips in MC11
   Float_t fYpos11[31];         // Y position of X strips in MC11
   Float_t fYpos21[63];         // Y position of X strips in MC21
-  //  Int_t fSegmentationType;     // segmentation old / new
 
 };
 #endif

diff --git a/MUON/AliMUONTriggerTrack.cxx b/MUON/AliMUONTriggerTrack.cxx
index 68eb207a4fa97b96d5682e00d91a84f289449503..c0fa4e0223610e82b9c154479e591755f78bf58f 100644 (file)
--- a/MUON/AliMUONTriggerTrack.cxx
+++ b/MUON/AliMUONTriggerTrack.cxx
@@ -32,20 +32,20 @@
 
 //__________________________________________________________________________
 AliMUONTriggerTrack::AliMUONTriggerTrack()
-  : TObject()
+  : TObject(),
+    fx11(0),
+    fy11(0),
+    fthetax(0),
+    fthetay(0),
+    fGTPattern(0)
+
 {
-    fEventReconstructor = 0;
-    fx11 = 0.;
-    fy11 = 0.;
-    fthetax = 0.;
-    fthetay = 0.;
-    fGTPattern = 0;
+  // default ctr
 }
 //__________________________________________________________________________
-AliMUONTriggerTrack::AliMUONTriggerTrack(Float_t x11, Float_t y11, Float_t thetax, Float_t thetay, Long_t theGTPattern,  AliMUONEventReconstructor* EventReconstructor)
+AliMUONTriggerTrack::AliMUONTriggerTrack(Float_t x11, Float_t y11, Float_t thetax, Float_t thetay, Long_t theGTPattern)
   : TObject()
 {
-    fEventReconstructor = EventReconstructor; // link back to EventReconstructor
     fx11 = x11;
     fy11 = y11;
     fthetax = thetax;
@@ -66,8 +66,6 @@ AliMUONTriggerTrack::~AliMUONTriggerTrack()
 AliMUONTriggerTrack::AliMUONTriggerTrack (const AliMUONTriggerTrack& theMUONTriggerTrack)
   : TObject(theMUONTriggerTrack)
 {
-  // fEventReconstructor = new AliMUONEventReconstructor(*MUONTriggerTrack.fEventReconstructor);
-  fEventReconstructor = theMUONTriggerTrack.fEventReconstructor;
   fx11 = theMUONTriggerTrack.fx11;
   fy11 = theMUONTriggerTrack.fy11;
   fthetax = theMUONTriggerTrack.fthetax;
@@ -86,8 +84,6 @@ theMUONTriggerTrack)
     // base class assignement
     TObject::operator=(theMUONTriggerTrack);
 
-    //fEventReconstructor = new AliMUONEventReconstructor(*theMUONTriggerTrack.fEventReconstructor);
-    fEventReconstructor = theMUONTriggerTrack.fEventReconstructor;
     fx11 = theMUONTriggerTrack.fx11;
     fy11 = theMUONTriggerTrack.fy11;
     fthetax = theMUONTriggerTrack.fthetax;

diff --git a/MUON/AliMUONTriggerTrack.h b/MUON/AliMUONTriggerTrack.h
index 594d4a4092db4a460d19d7a3a58ea5028191fd30..68dd815061358c232a114aaa282b461350664cdc 100644 (file)
--- a/MUON/AliMUONTriggerTrack.h
+++ b/MUON/AliMUONTriggerTrack.h
@@ -22,7 +22,7 @@ class AliMUONTriggerTrack : public TObject
     AliMUONTriggerTrack (const AliMUONTriggerTrack& AliMUONTriggerTrack); // copy constructor
     AliMUONTriggerTrack& operator=(const AliMUONTriggerTrack& AliMUONTriggerTrack); // assignment operator
     AliMUONTriggerTrack(Float_t x11, Float_t y11, Float_t thetax, Float_t thetay,
-                        Long_t theGTPattern,  AliMUONEventReconstructor* eventReconstructor); 
+                        Long_t theGTPattern); 
                        // Constructor
     Float_t GetX11() const {return fx11;}
     Float_t GetY11() const {return fy11;}
@@ -34,7 +34,6 @@ class AliMUONTriggerTrack : public TObject
     
 protected:
   private:
-  AliMUONEventReconstructor* fEventReconstructor; //!   Pointer to EventReconstructor
   Float_t fx11;    // x position of fired Y strip in MC11
   Float_t fy11;    // y position of fired X strip in MC11
   Float_t fthetax; // track theta angle in X   

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 724125a4366b259cdbc78afbced51feb816f3539..870d7bcb0666abfd849d761d8222f4958c2ff3c2 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -176,27 +176,18 @@ void AliMUONv1::Init()
    fGeometryBuilder->InitGeometry();
    AliDebug(1,"Finished Init for version 1 - CPC chamber type");   
 
-   if (fSegmentationType == 1) {
-     AliFatal("Old Segmentation no more supported");
-   }
+   fFactory = new AliMUONFactoryV2("New MUON Factory");
+   AliInfo("New Segmentation");
 
-   if (fSegmentationType == 2) {
-     fFactory = new AliMUONFactoryV2("New MUON Factory");
-     AliInfo("New Segmentation");
-   } 
 
    fFactory->Build(this, "default");
 
    //
    // Initialize segmentation
    //
-   if (!fSegmentationType) {
-     AliFatal("No Segmentation Type defined.");
-     return;
-   }
 
    for (i=0; i<AliMUONConstants::NCh(); i++) 
-     ( (AliMUONChamber*) (*fChambers)[i])->Init(fSegmentationType);// new segmentation
+     ( (AliMUONChamber*) (*fChambers)[i])->Init(2);// new segmentation
    
  
    // trigger circuit