- Dummy z-arguments in GetPadI, SetHit, FirstPad replaced by real z-coordinate

        to make code work with slat chambers.

diff --git a/MUON/AliMUONClusterInput.cxx b/MUON/AliMUONClusterInput.cxx
index a09ce63ed351365749ef2823bd24f9ce5405f526..1023f0ee5de73644942381b014fc2d55f7e8e14f 100644 (file)
--- a/MUON/AliMUONClusterInput.cxx
+++ b/MUON/AliMUONClusterInput.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.5  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.4  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.
@@ -62,7 +68,7 @@ AliMUONClusterInput* AliMUONClusterInput::Instance()
 // return pointer to the singleton instance
     if (fgClusterInput == 0) {
        fgClusterInput = new AliMUONClusterInput();
-       fgMinuit = new TMinuit(5);
+       fgMinuit = new TMinuit(8);
     }
     
     return fgClusterInput;
@@ -134,6 +140,9 @@ void  AliMUONClusterInput::SetCluster(AliMUONRawCluster* cluster)
            fiy[i][cath]=iy;
            // total charge per cluster
            qtot+=fCharge[i][cath];
+           // Current z
+           Float_t xc, yc;
+           fSegmentation[cath]->GetPadC(ix,iy,xc,yc,fZ);
        } // loop over cluster digits
        fQtot[cath]=qtot;
        fChargeTot[cath]=Int_t(qtot);  
@@ -149,7 +158,7 @@ Float_t AliMUONClusterInput::DiscrChargeS1(Int_t i,Double_t *par)
 
    fSegmentation[0]->SetPad(fix[i][0], fiy[i][0]);
 //  First Cluster
-   fSegmentation[0]->SetHit(par[0],par[1],0);
+   fSegmentation[0]->SetHit(par[0],par[1],fZ);
    Float_t q1=fResponse->IntXY(fSegmentation[0]);
     
    Float_t value = fQtot[0]*q1;
@@ -163,7 +172,7 @@ Float_t AliMUONClusterInput::DiscrChargeCombiS1(Int_t i,Double_t *par, Int_t cat
 
    fSegmentation[cath]->SetPad(fix[i][cath], fiy[i][cath]);
 //  First Cluster
-   fSegmentation[cath]->SetHit(par[0],par[1],0);
+   fSegmentation[cath]->SetHit(par[0],par[1],fZ);
    Float_t q1=fResponse->IntXY(fSegmentation[cath]);
     
    Float_t value = fQtot[cath]*q1;
@@ -182,11 +191,11 @@ Float_t AliMUONClusterInput::DiscrChargeS2(Int_t i,Double_t *par)
 
    fSegmentation[0]->SetPad(fix[i][0], fiy[i][0]);
 //  First Cluster
-   fSegmentation[0]->SetHit(par[0],par[1],0);
+   fSegmentation[0]->SetHit(par[0],par[1],fZ);
    Float_t q1=fResponse->IntXY(fSegmentation[0]);
     
 //  Second Cluster
-   fSegmentation[0]->SetHit(par[2],par[3],0);
+   fSegmentation[0]->SetHit(par[2],par[3],fZ);
    Float_t q2=fResponse->IntXY(fSegmentation[0]);
     
    Float_t value = fQtot[0]*(par[4]*q1+(1.-par[4])*q2);
@@ -204,11 +213,11 @@ Float_t AliMUONClusterInput::DiscrChargeCombiS2(Int_t i,Double_t *par, Int_t cat
 
    fSegmentation[cath]->SetPad(fix[i][cath], fiy[i][cath]);
 //  First Cluster
-   fSegmentation[cath]->SetHit(par[0],par[1],0);
+   fSegmentation[cath]->SetHit(par[0],par[1],fZ);
    Float_t q1=fResponse->IntXY(fSegmentation[cath]);
     
 //  Second Cluster
-   fSegmentation[cath]->SetHit(par[2],par[3],0);
+   fSegmentation[cath]->SetHit(par[2],par[3],fZ);
    Float_t q2=fResponse->IntXY(fSegmentation[cath]);
    Float_t value;
    if (cath==0) {

diff --git a/MUON/AliMUONClusterInput.h b/MUON/AliMUONClusterInput.h
index 2653cf88a8db52aac0338a5140bb25c8b86ef515..a7e6715b6932e3018577f5047d0063e33add4a52 100644 (file)
--- a/MUON/AliMUONClusterInput.h
+++ b/MUON/AliMUONClusterInput.h
@@ -63,6 +63,7 @@ class AliMUONClusterInput : public TObject {
     Float_t              fCharge[500][2];  // ! List of charges for current cluster
     Int_t                fChargeTot[2];    // ! Total charge
     Float_t              fQtot[2];         // ! Total charge
+    Float_t              fZ;                // ! Current z-position
     // Fitter
     static TMinuit*      fgMinuit;          // ! Fitter
     ClassDef(AliMUONClusterInput, 0)        // Global data service for hit reconstruction