Cleaning of the code :

[u/mrichter/AliRoot.git] / MUON / AliMUONChamberTrigger.cxx

diff --git a/MUON/AliMUONChamberTrigger.cxx b/MUON/AliMUONChamberTrigger.cxx
index c68ba35d0a71fb6e5ae9c06f74c34c43d45c2a39..f2578963e70392d9675cb9f961616624fef90df7 100644 (file)
--- a/MUON/AliMUONChamberTrigger.cxx
+++ b/MUON/AliMUONChamberTrigger.cxx
@@ -15,6 +15,19 @@
 
 /*
 $Log$
+Revision 1.6  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.5  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.4  2000/06/29 06:52:02  pcrochet
+pow changed to TMath::Power
+
 Revision 1.3  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
@@ -47,9 +60,16 @@ Draft version
 ClassImp(AliMUONChamberTrigger)
 
 //-------------------------------------------
-AliMUONChamberTrigger::AliMUONChamberTrigger() : AliMUONChamber()
+
+    AliMUONChamberTrigger::AliMUONChamberTrigger()
+{
+// Default constructor
+}
+
+
+AliMUONChamberTrigger::AliMUONChamberTrigger(Int_t id) : AliMUONChamber(id)
 {
-// Default Constructor
+// Constructor using chamber id
 }
 
 //-------------------------------------------
@@ -74,13 +94,13 @@ void AliMUONChamberTrigger::DisIntegration(Float_t eloss, Float_t tof,
   Float_t qp;
   nnew=0;
   for (Int_t i=1; i<=fnsec; i++) {
-    AliMUONSegmentation * segmentation=
-      (AliMUONSegmentation*) (*fSegmentation)[i-1];
+    AliSegmentation * segmentation=
+      (AliSegmentation*) (*fSegmentation)[i-1];
     
 // Find the module & strip Id. which has fired
     Int_t ix,iy;
     
-    segmentation->GetPadIxy(xhit,yhit,0,ix,iy);
+    segmentation->GetPadI(xhit,yhit,0,ix,iy);
     segmentation->SetPad(ix,iy);
 
 // treatment of GEANT hits w/o corresponding strip (due to the fact that
@@ -106,8 +126,8 @@ void AliMUONChamberTrigger::DisIntegration(Float_t eloss, Float_t tof,
        
        // neighbour real coordinates (just for checks here)
        Float_t x,y,z;
-       segmentation->GetPadCxy(xList[j],yList[j],x,y,z);
-       // set pad (fx fy & fix fiy are the current pad coord. & Id.)
+       segmentation->GetPadC(xList[j],yList[j],x,y,z);
+       // set pad (fX fY & fIx fIy are the current pad coord. & Id.)
        segmentation->SetPad(xList[j],yList[j]);
        // get the chamber (i.e. current strip) response
        qp=fResponse->IntXY(segmentation);