Put default wise two cathodes per chamber (Ch. Finck)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 3b8f8d4d118de40a22b75d7a82bda7876f7ca564..b8b617d5b6fd1861a0885253cbce401823f2da8e 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -405,12 +405,6 @@ void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
     ((AliMUONChamber*) fChambers->At(id))->SetResponseModel(response);
 }
 //____________________________________________________________________
-void   AliMUON::SetNsec(Int_t id, Int_t nsec)
-{
-// Set number of segmented cathods for chamber id
-    ((AliMUONChamber*) fChambers->At(id))->SetNsec(nsec);
-}
-//____________________________________________________________________
 AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
 {
   return new AliMUONDigitizerv2(manager);

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 1091e5ed6d94430a7742cfe1d1bf244174add7a5..e6ad4a9c2c56f254a041c4e54ac38559eb019c47 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -82,7 +82,6 @@ class AliMUON : public  AliDetector
                                        AliMUONGeometrySegmentation* segmentation);
 
     virtual void   SetResponseModel(Int_t id, AliMUONResponse *response);
-    virtual void   SetNsec(Int_t id, Int_t nsec);
 
     // Set Stepping Parameters
     virtual void   SetMaxStepGas(Float_t p1);

diff --git a/MUON/AliMUONChamber.cxx b/MUON/AliMUONChamber.cxx
index 69a886ed677e889283089f4830f8522347b0003a..6b298994e3c46b2ceb6ca3a8d1330d86e7f50cda 100644 (file)
--- a/MUON/AliMUONChamber.cxx
+++ b/MUON/AliMUONChamber.cxx
@@ -36,7 +36,6 @@ AliMUONChamber::AliMUONChamber()
     fdGas(0.),
     fdAlu(0.),
     fZ(0.),
-    fnsec(1),
     frMin(0.),
     frMax(0.),
     fCurrentCorrel(1), // to avoid mistakes if ChargeCorrelInit is not called
@@ -55,7 +54,6 @@ AliMUONChamber::AliMUONChamber(Int_t id)
     fdGas(0.),
     fdAlu(0.),
     fZ(0.),
-    fnsec(1),
     frMin(0.),
     frMax(0.),
     fCurrentCorrel(1), // to avoid mistakes if ChargeCorrelInit is not called
@@ -130,11 +128,9 @@ Bool_t  AliMUONChamber::IsSensId(Int_t volId) const
 void AliMUONChamber::ChargeCorrelationInit() {
   // Initialisation of charge correlation for current hit
   // the value is stored, and then used by Disintegration
-  if (fnsec==1) 
-    fCurrentCorrel =1;
-  else 
-    // exponential is here to avoid eventual problems in 0 
-    // factor 2 because chargecorrel is q1/q2 and not q1/qtrue
+
+  // exponential is here to avoid eventual problems in 0 
+  // factor 2 because chargecorrel is q1/q2 and not q1/qtrue
     fCurrentCorrel = TMath::Exp(gRandom->Gaus(0,fResponse->ChargeCorrel()/2));
 }
 
@@ -158,14 +154,11 @@ void AliMUONChamber::Init(Int_t flag)
 
   if (!flag)    AliFatal("wrong segmentation type.");
 
-
   if (fSegmentation2->At(0)) 
     ((AliMUONGeometrySegmentation*) fSegmentation2->At(0))->Init(fId);
-
-  if (fnsec==2) {
-    if (fSegmentation2->At(1))
-      ((AliMUONGeometrySegmentation*) fSegmentation2->At(1))->Init(fId);
-  }
+  if (fSegmentation2->At(1))
+    ((AliMUONGeometrySegmentation*) fSegmentation2->At(1))->Init(fId);
+ 
 }
 // //_________________________________________________________________
 // void    AliMUONChamber::SigGenInit(AliMUONHit *hit)
@@ -178,12 +171,9 @@ void AliMUONChamber::Init(Int_t flag)
 //   Float_t z = hit->Z();
 //   Int_t  id = hit->DetElemId();
 
-//   if (fnsec==1) {
-//     ((AliMUONGeometrySegmentation*) fSegmentation2->At(0))->SigGenInit(id, x, y, z) ;
-//   } else {
-//     ((AliMUONGeometrySegmentation*) fSegmentation2->At(0))->SigGenInit(id, x, y, z) ;
-//     ((AliMUONGeometrySegmentation*) fSegmentation2->At(1))->SigGenInit(id, x, y, z) ;
-//   }
+//   ((AliMUONGeometrySegmentation*) fSegmentation2->At(0))->SigGenInit(id, x, y, z) ;
+//   ((AliMUONGeometrySegmentation*) fSegmentation2->At(1))->SigGenInit(id, x, y, z) ;
+
 // }
 
 //_______________________________________________________
@@ -216,7 +206,7 @@ void AliMUONChamber::DisIntegration(AliMUONHit *hit,
   nnew=0;
     
   // Cathode plane loop
-  for (Int_t i=1; i<=fnsec; i++) {
+  for (Int_t i = 1; i <= 2; i++) {
     Float_t qcath = qtot * (i==1? fCurrentCorrel : 1/fCurrentCorrel);
 
     AliMUONGeometrySegmentation* segmentation=

diff --git a/MUON/AliMUONChamber.h b/MUON/AliMUONChamber.h
index c68eefe2bf117def0ee7c0944a1352224d2e67b6..22c1f14667ef853f55f1f52ca607c5f72d4159c4 100644 (file)
--- a/MUON/AliMUONChamber.h
+++ b/MUON/AliMUONChamber.h
@@ -65,10 +65,6 @@ class AliMUONChamber : public TObject
       return (AliMUONGeometrySegmentation*) (*fSegmentation2)[isec-1];
   }
 
-// Get number of segmentation sectors  
-  virtual Int_t Nsec() const        {return fnsec;}
-// Set number of segmented cathodes (1 or 2)  
-  virtual void  SetNsec(Int_t nsec) {fnsec=nsec;}
 //
 // Member function forwarding to the segmentation and response models
 //
@@ -122,7 +118,6 @@ class AliMUONChamber : public TObject
   Float_t fdGas; // half gaz gap
   Float_t fdAlu; // half Alu width  
   Float_t fZ;    // Z position (cm)
-  Int_t   fnsec; // number of semented cathode planes
   Float_t frMin; // innermost sensitive radius
   Float_t frMax; // outermost sensitive radius
   Float_t fCurrentCorrel; //! charge correlation for current hit.

diff --git a/MUON/AliMUONChamberTrigger.cxx b/MUON/AliMUONChamberTrigger.cxx
index e5604667f5268a4787150bc39ece199f1087a6ba..4f10f4e562082d45cad561b0dc3b478b5ff21354 100644 (file)
--- a/MUON/AliMUONChamberTrigger.cxx
+++ b/MUON/AliMUONChamberTrigger.cxx
@@ -63,7 +63,7 @@ void AliMUONChamberTrigger::DisIntegration(AliMUONHit* hit,
 
   Float_t qp;
   nnew=0;
-  for (Int_t i=1; i<=fnsec; i++) {
+  for (Int_t i = 1; i <= 2; i++) {
     AliMUONGeometrySegmentation * segmentation=
       (AliMUONGeometrySegmentation*) (*fSegmentation2)[i-1];
     

diff --git a/MUON/AliMUONFactoryV2.cxx b/MUON/AliMUONFactoryV2.cxx
index 77b95c322a12769d1b8fe74ae5bf04433d994d15..bbf5ab0ec09f28c7d9fb4c3f73763ccf7ede7092 100644 (file)
--- a/MUON/AliMUONFactoryV2.cxx
+++ b/MUON/AliMUONFactoryV2.cxx
@@ -177,9 +177,6 @@ void AliMUONFactoryV2::BuildStation1()
     //--------------------------------------------------------
     // Configuration for Chamber TC1/2  (Station 1) ----------           
 
-
-    fMUON->SetNsec(chamber,2);
-
     // cathode 0
     segmentation[0]->Add(id0,      bendSt1);
     segmentation[0]->Add(id0 +  3, nonbendSt1);
@@ -232,9 +229,6 @@ void AliMUONFactoryV2::BuildStation2()
     //--------------------------------------------------------
     // Configuration for Chamber TC3/4  (Station 2) ----------           
 
-
-    fMUON->SetNsec(chamber,2);
-
     // cathode 0
     segmentation[0]->Add(id0,      bendSt2);
     segmentation[0]->Add(id0 +  3, nonbendSt2);
@@ -334,8 +328,6 @@ void AliMUONFactoryV2::BuildStation3()
     // id detection elt for chamber 1
     Int_t id0 = (chamber+1)*100;
 
-    fMUON->SetNsec(chamber,2);
-
     // cathode 0
     // type 220000
     segmentation[0]->Add(id0+14, slatsegB[3]);
@@ -508,9 +500,6 @@ void AliMUONFactoryV2::BuildStation4()
     //--------------------------------------------------------
     // Configuration for Chamber TC6/7  (Station 4) ----------           
 
-
-    fMUON->SetNsec(chamber,2);
-
     // cathode 0
     // type 122330
     segmentation[0]->Add(id0+13, slatsegB[0]);
@@ -701,9 +690,6 @@ void AliMUONFactoryV2::BuildStation5()
     //--------------------------------------------------------
     // Configuration for Chamber TC8/9  (Station 5) ----------           
 
-
-    fMUON->SetNsec(chamber,2);
-
     // cathode 0
     // type 122330
     segmentation[0]->Add(id0+13, slatsegB[0]);
@@ -928,7 +914,6 @@ void AliMUONFactoryV2::BuildStation6()
       chamberSeg[0] = new AliMUONGeometrySegmentation(fMUON->Chamber(chamber).GetGeometry());
       chamberSeg[1] = new AliMUONGeometrySegmentation(fMUON->Chamber(chamber).GetGeometry());
 
-      fMUON->SetNsec(chamber,2);
       Int_t icount=chamber-10;  // chamber counter (0 1 2 3)
       Int_t id0=(10+icount+1)*100;
 
@@ -999,8 +984,6 @@ void AliMUONFactoryV2::BuildStation(AliMUON* where, Int_t stationNumber)
   //
   // Version 0
   //
-  // First define the number of planes that are segmented (1 or 2) by a call
-  // to SetNsec.
   // Then chose for each chamber (chamber plane) the segmentation
   // and response model.
   // They should be equal for the two chambers of each station. In a future